-
-
Notifications
You must be signed in to change notification settings - Fork 404
Fix logging from low level operations #364
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
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
// This file is part of arduino-cli. | ||
// | ||
// Copyright 2019 ARDUINO SA (http://www.arduino.cc/) | ||
// | ||
// This software is released under the GNU General Public License version 3, | ||
// which covers the main part of arduino-cli. | ||
// The terms of this license can be found at: | ||
// https://www.gnu.org/licenses/gpl-3.0.en.html | ||
// | ||
// You can be released from the requirements of the above licenses by purchasing | ||
// a commercial license. Buying such a license is mandatory if you want to modify or | ||
// otherwise use the software for commercial activities involving the Arduino | ||
// software without disclosing the source code of your own applications. To purchase | ||
// a commercial license, send an email to [email protected]. | ||
|
||
package commands | ||
|
||
import ( | ||
"fmt" | ||
"io" | ||
|
||
"github.com/arduino/arduino-cli/legacy/builder/constants" | ||
"github.com/arduino/arduino-cli/legacy/builder/i18n" | ||
"github.com/sirupsen/logrus" | ||
) | ||
|
||
// LegacyLogger wraps logrus but can be used within the `legacy` package | ||
type LegacyLogger struct{} | ||
|
||
// Fprintln is supposed to let the caller decide the target, let's not do it | ||
// and just forward to Println | ||
func (l LegacyLogger) Fprintln(w io.Writer, level string, format string, a ...interface{}) { | ||
l.Println(level, format, a...) | ||
} | ||
|
||
// Println is a regular log call | ||
func (l LegacyLogger) Println(level string, format string, a ...interface{}) { | ||
msg := legacyFormat(format, a...) | ||
|
||
switch level { | ||
case constants.LOG_LEVEL_INFO: | ||
logrus.Info(msg) | ||
case constants.LOG_LEVEL_DEBUG: | ||
logrus.Debug(msg) | ||
case constants.LOG_LEVEL_ERROR: | ||
logrus.Error(msg) | ||
case constants.LOG_LEVEL_WARN: | ||
logrus.Warn(msg) | ||
default: | ||
logrus.Trace(msg) | ||
} | ||
} | ||
|
||
// UnformattedFprintln will do the same as Fprintln | ||
func (l LegacyLogger) UnformattedFprintln(w io.Writer, str string) { | ||
l.Println(constants.LOG_LEVEL_INFO, str) | ||
} | ||
|
||
// UnformattedWrite will do the same as Fprintln | ||
func (l LegacyLogger) UnformattedWrite(w io.Writer, data []byte) { | ||
l.Println(constants.LOG_LEVEL_INFO, string(data)) | ||
} | ||
|
||
// Flush is a noop | ||
func (l LegacyLogger) Flush() string { | ||
return "" | ||
} | ||
|
||
// Name doesn't matter | ||
func (l LegacyLogger) Name() string { | ||
return "legacy" | ||
} | ||
|
||
func legacyFormat(format string, a ...interface{}) string { | ||
format = i18n.FromJavaToGoSyntax(format) | ||
message := fmt.Sprintf(format, a...) | ||
return message | ||
} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that this will create some regressions because the parameter
w
must be considered to redirect the output to the correct stream... the legacyi18n
module is really a mess, let's have a call to plan a way to migrate to a saner logging infra.