Removes logrus package and refactors logging messages (#5293)
This fix removes logrus package dependency and refactors the console logging as the only logging mechanism by removing file logging support. It rearranges the log message format and adds stack trace information whenever trace information is not available in the error structure. It also adds `--json` flag support for server logging. When minio server is started with `--json` flag, all log messages are displayed in json format, with no start-up and informational log messages. Fixes #5265 #5220 #5197master
ebozduman
7 years ago
committed by
kannappanr
parent
85580fe0d6
commit
24d9d7e5fa
@ -1,74 +0,0 @@ |
||||
/* |
||||
* Minio Cloud Storage, (C) 2017 Minio, Inc. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package cmd |
||||
|
||||
import ( |
||||
"fmt" |
||||
"os" |
||||
|
||||
"github.com/Sirupsen/logrus" |
||||
) |
||||
|
||||
// ConsoleLogger - console logger which logs into stderr.
|
||||
type ConsoleLogger struct { |
||||
BaseLogTarget |
||||
} |
||||
|
||||
// Fire - log entry handler.
|
||||
func (logger ConsoleLogger) Fire(entry *logrus.Entry) error { |
||||
if !logger.Enable { |
||||
return nil |
||||
} |
||||
|
||||
msgBytes, err := logger.formatter.Format(entry) |
||||
if err == nil { |
||||
fmt.Fprintf(os.Stderr, string(msgBytes)) |
||||
} |
||||
|
||||
return err |
||||
} |
||||
|
||||
// String - represents ConsoleLogger as string.
|
||||
func (logger ConsoleLogger) String() string { |
||||
enableStr := "disabled" |
||||
if logger.Enable { |
||||
enableStr = "enabled" |
||||
} |
||||
|
||||
return fmt.Sprintf("console:%s", enableStr) |
||||
} |
||||
|
||||
// NewConsoleLogger - return new console logger object.
|
||||
func NewConsoleLogger() (logger ConsoleLogger) { |
||||
logger.Enable = true |
||||
logger.formatter = new(logrus.TextFormatter) |
||||
|
||||
return logger |
||||
} |
||||
|
||||
// InitConsoleLogger - initializes console logger.
|
||||
func InitConsoleLogger(logger *ConsoleLogger) { |
||||
if !logger.Enable { |
||||
return |
||||
} |
||||
|
||||
if logger.formatter == nil { |
||||
logger.formatter = new(logrus.TextFormatter) |
||||
} |
||||
|
||||
return |
||||
} |
||||
@ -1,86 +0,0 @@ |
||||
/* |
||||
* Minio Cloud Storage, (C) 2017 Minio, Inc. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package cmd |
||||
|
||||
import ( |
||||
"fmt" |
||||
"os" |
||||
|
||||
"github.com/Sirupsen/logrus" |
||||
) |
||||
|
||||
// FileLogger - file logger which logs to a file.
|
||||
type FileLogger struct { |
||||
BaseLogTarget |
||||
Filename string `json:"filename"` |
||||
file *os.File |
||||
} |
||||
|
||||
// Fire - log entry handler.
|
||||
func (logger FileLogger) Fire(entry *logrus.Entry) (err error) { |
||||
if !logger.Enable { |
||||
return nil |
||||
} |
||||
|
||||
msgBytes, err := logger.formatter.Format(entry) |
||||
if err != nil { |
||||
return err |
||||
} |
||||
|
||||
if _, err = logger.file.Write(msgBytes); err != nil { |
||||
return err |
||||
} |
||||
|
||||
err = logger.file.Sync() |
||||
return err |
||||
} |
||||
|
||||
// String - represents ConsoleLogger as string.
|
||||
func (logger FileLogger) String() string { |
||||
enableStr := "disabled" |
||||
if logger.Enable { |
||||
enableStr = "enabled" |
||||
} |
||||
|
||||
return fmt.Sprintf("file:%s:%s", enableStr, logger.Filename) |
||||
} |
||||
|
||||
// NewFileLogger - creates new file logger object.
|
||||
func NewFileLogger(filename string) (logger FileLogger) { |
||||
logger.Enable = true |
||||
logger.formatter = new(logrus.JSONFormatter) |
||||
logger.Filename = filename |
||||
|
||||
return logger |
||||
} |
||||
|
||||
// InitFileLogger - initializes file logger.
|
||||
func InitFileLogger(logger *FileLogger) (err error) { |
||||
if !logger.Enable { |
||||
return err |
||||
} |
||||
|
||||
if logger.formatter == nil { |
||||
logger.formatter = new(logrus.JSONFormatter) |
||||
} |
||||
|
||||
if logger.file == nil { |
||||
logger.file, err = os.OpenFile(logger.Filename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0664) |
||||
} |
||||
|
||||
return err |
||||
} |
||||
@ -1,31 +0,0 @@ |
||||
/* |
||||
* Minio Cloud Storage (C) 2015, 2016, 2017 Minio, Inc. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); |
||||
* you may not use this file except in compliance with the License. |
||||
* You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software |
||||
* distributed under the License is distributed on an "AS IS" BASIS, |
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||
* See the License for the specific language governing permissions and |
||||
* limitations under the License. |
||||
*/ |
||||
|
||||
package cmd |
||||
|
||||
import ( |
||||
"testing" |
||||
) |
||||
|
||||
// Tests getSource().
|
||||
func TestGetSource(t *testing.T) { |
||||
currentSource := func() string { return getSource() } |
||||
gotSource := currentSource() |
||||
expectedSource := "[logger_test.go:26:TestGetSource()]" |
||||
if gotSource != expectedSource { |
||||
t.Errorf("expected : %s, got : %s", expectedSource, gotSource) |
||||
} |
||||
} |
||||
Loading…
Reference in new issue