Skip to content

Issue with logger s configuration subroutine #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2020

Conversation

jvdp1
Copy link
Member

@jvdp1 jvdp1 commented Nov 25, 2020

@wclodius2
I found a small issue within stdlib_logger. If the subroutine configuration is called and no units are associated with the logger, self % log_units is not allocated, and leads to a segfault (in debug mode) when the program tries to use it for allocating log_units.
With my proposition, log_units will be a zero-sized array in such situations (as it is tested like that in the tests).

@wclodius2
Copy link
Contributor

@jvdp1 the two changes look good to me. Sorry for missing that problem.

@wclodius2
Copy link
Contributor

It looks to me like your changes are for a PR against the master, and not against logger-safe-async-io. I don't believe I have write access to the master repository so I can't do a merge there. Do you want me to copy the changes to logger-safe-async-io and we just do a merge of that, or did you have other ideas?

@jvdp1
Copy link
Member Author

jvdp1 commented Nov 25, 2020

It looks to me like your changes are for a PR against the master, and not against logger-safe-async-io. I don't believe I have write access to the master repository so I can't do a merge there. Do you want me to copy the changes to logger-safe-async-io and we just do a merge of that, or did you have other ideas?

Thank you for the approcal.
Since it is a small change and that it is not related to logger-safe-async-io, I will merge it in master.
Anyway, I can open a PR to logger-safe-async-io if you want, but I don't think it is needed at this stage.

@jvdp1 jvdp1 merged commit 917adb9 into fortran-lang:master Nov 25, 2020
@wclodius2
Copy link
Contributor

Will git pull https://github.com/fortran-lang/stdlib merge your changes into my local version of logger-safe-async-io so it can them be pushed?

@jvdp1
Copy link
Member Author

jvdp1 commented Nov 25, 2020

Will git pull https://github.com/fortran-lang/stdlib merge your changes into my local version of logger-safe-async-io so it can them be pushed?

In you local directory, you could do:

git checkout logger-safe-async-io
git fetch upstream master    #assuming upstream points to github.com/fortran-lang/stdlib
git merge --no-ff upstream/master
git push origin logger-safe-async-io

@wclodius2
Copy link
Contributor

git merge --no-ff upstream/master

gives me

merge: upstream/stdlib - not something we can merge

@jvdp1
Copy link
Member Author

jvdp1 commented Nov 25, 2020 via email

@wclodius2
Copy link
Contributor

All of the following gives the same result

stdlib % git merge --no-ff upstream/master
merge: upstream/master - not something we can merge
git merge --no-ff https://github.com/fortran-lang/stdlib/master
merge: https://github.com/fortran-lang/stdlib/master - not something we can merge
git merge --no-ff https://github.com/fortran-lang/stdlib      
merge: https://github.com/fortran-lang/stdlib - not something we can merge
git merge --no-ff github.com/fortran-lang/stdlib/master      
merge: github.com/fortran-lang/stdlib/master - not something we can merge

@jvdp1
Copy link
Member Author

jvdp1 commented Nov 25, 2020

All of the following gives the same result

stdlib % git merge --no-ff upstream/master
merge: upstream/master - not something we can merge
git merge --no-ff https://github.com/fortran-lang/stdlib/master
merge: https://github.com/fortran-lang/stdlib/master - not something we can merge
git merge --no-ff https://github.com/fortran-lang/stdlib      
merge: https://github.com/fortran-lang/stdlib - not something we can merge
git merge --no-ff github.com/fortran-lang/stdlib/master      
merge: github.com/fortran-lang/stdlib/master - not something we can merge

Is upstream associated with www.github.com/fortran-lang/stdlib ? What does git remote -v return?

@wclodius2
Copy link
Contributor

git remote -v
origin	https://github.com/fortran-lang/stdlib (fetch)
origin	https://github.com/fortran-lang/stdlib (push)
william	git@github.com:wclodius2/stdlib.git (fetch)
william	git@github.com:wclodius2/stdlib.git (push)

@jvdp1
Copy link
Member Author

jvdp1 commented Nov 25, 2020

git remote -v
origin	https://github.com/fortran-lang/stdlib (fetch)
origin	https://github.com/fortran-lang/stdlib (push)
william	git@github.com:wclodius2/stdlib.git (fetch)
william	git@github.com:wclodius2/stdlib.git (push)

Ok. I understand. Your origin is what I call upstream. The following should work:

git checkout logger-safe-async-io
git fetch origin master
git merge --no-ff origin/master
git push william logger-safe-async-io

@wclodius2
Copy link
Contributor

Thanks its merged into logger-safe-async-io now.

@jvdp1 jvdp1 deleted the issues branch December 22, 2021 16:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants