Handle log output with log4perl #86
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Originally, logging to a file was done by piping screen output to `tee(1)`. This prevented some output from being logged, as only the systemd service did this. Instead, use a native log4perl file appender to log to the file. This eliminates colored output, since there is no direct way to save color data to the file anymore. Restoring this feature will be explored in a future issue. Resolves #71 and #83.
toddr
reviewed
Apr 11, 2022
| @@ -3195,7 +3192,7 @@ sub install_cpanel_elevate_service { | |||
| Type=simple | |||
| # want to run it once per boot time | |||
| RemainAfterExit=yes | |||
| ExecStart=/usr/bin/bash -c 'exec /usr/local/cpanel/scripts/elevate-cpanel --service 2>&1 | /usr/bin/tee -a $log_file' | |||
toddr
reviewed
Apr 11, 2022
| my $program = shift @args; | ||
| my ( $callback_out, $callback_err ) = map { | ||
| my $label = $_; | ||
| Cpanel::IOCallbackWriteLine->new( sub ($line) { chomp $line; INFO("{$label} $line"); } ) |
|
If logging to the systemd journal is not desirable, the |
toddr
reviewed
Apr 11, 2022
| ); | ||
| INFO(); # Buffer so they can more easily read the output. | ||
|
|
||
| return $? = $sr->CHILD_ERROR; ## no critic qw(Variables::RequireLocalizedPunctuationVars) -- emulate return behavior of system() |
There was a problem hiding this comment.
I'm not wild about us clobbering $? why would we want to set that?
There was a problem hiding this comment.
The use of system already clobbered $?, so this just maintains "feature" parity. It doesn't need to stay.
This was referenced Apr 11, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Originally, logging to a file was done by piping screen output to
tee(1). This prevented some output from being logged, as only thesystemd service did this. Instead, use a native log4perl file appender
to log to the file.
This eliminates colored output, since there is no direct way to save
color data to the file anymore. Restoring this feature will be explored
in a future issue.
Resolves #71 and #83.
By submitting pull requests to this repo, I agree to the Contributor License Agreement which can be found at: https://github.com/cpanel/elevate/blob/main/docs/cPanel-CLA.pdf