|
@@ -53,30 +53,52 @@ var (
|
53
|
53
|
|
54
|
54
|
// Manager is the main interface used to log debug/info/error messages.
|
55
|
55
|
type Manager struct {
|
|
56
|
+ configMutex sync.RWMutex
|
56
|
57
|
loggers []singleLogger
|
57
|
58
|
stdoutWriteLock sync.Mutex // use one lock for both stdout and stderr
|
58
|
59
|
fileWriteLock sync.Mutex
|
59
|
|
- DumpingRawInOut bool
|
|
60
|
+ dumpingRawInOut bool
|
60
|
61
|
}
|
61
|
62
|
|
62
|
63
|
// Config represents the configuration of a single logger.
|
63
|
|
-type Config struct {
|
64
|
|
- // logging methods
|
65
|
|
- MethodStdout bool
|
66
|
|
- MethodStderr bool
|
67
|
|
- MethodFile bool
|
68
|
|
- Filename string
|
69
|
|
- // logging level
|
70
|
|
- Level Level
|
71
|
|
- // logging types
|
72
|
|
- Types []string
|
73
|
|
- ExcludedTypes []string
|
|
64
|
+type LoggingConfig struct {
|
|
65
|
+ Method string
|
|
66
|
+ MethodStdout bool
|
|
67
|
+ MethodStderr bool
|
|
68
|
+ MethodFile bool
|
|
69
|
+ Filename string
|
|
70
|
+ TypeString string `yaml:"type"`
|
|
71
|
+ Types []string `yaml:"real-types"`
|
|
72
|
+ ExcludedTypes []string `yaml:"real-excluded-types"`
|
|
73
|
+ LevelString string `yaml:"level"`
|
|
74
|
+ Level Level `yaml:"level-real"`
|
74
|
75
|
}
|
75
|
76
|
|
76
|
77
|
// NewManager returns a new log manager.
|
77
|
|
-func NewManager(config ...Config) (*Manager, error) {
|
|
78
|
+func NewManager(config []LoggingConfig) (*Manager, error) {
|
78
|
79
|
var logger Manager
|
79
|
80
|
|
|
81
|
+ if err := logger.ApplyConfig(config); err != nil {
|
|
82
|
+ return nil, err
|
|
83
|
+ }
|
|
84
|
+
|
|
85
|
+ return &logger, nil
|
|
86
|
+}
|
|
87
|
+
|
|
88
|
+func (logger *Manager) ApplyConfig(config []LoggingConfig) error {
|
|
89
|
+ logger.configMutex.Lock()
|
|
90
|
+ defer logger.configMutex.Unlock()
|
|
91
|
+
|
|
92
|
+ for _, logger := range logger.loggers {
|
|
93
|
+ logger.Close()
|
|
94
|
+ }
|
|
95
|
+
|
|
96
|
+ logger.loggers = nil
|
|
97
|
+ logger.dumpingRawInOut = false
|
|
98
|
+
|
|
99
|
+ // for safety, this deep-copies all mutable data in `config`
|
|
100
|
+ // XXX let's keep it that way
|
|
101
|
+ var lastErr error
|
80
|
102
|
for _, logConfig := range config {
|
81
|
103
|
typeMap := make(map[string]bool)
|
82
|
104
|
for _, name := range logConfig.Types {
|
|
@@ -101,12 +123,12 @@ func NewManager(config ...Config) (*Manager, error) {
|
101
|
123
|
fileWriteLock: &logger.fileWriteLock,
|
102
|
124
|
}
|
103
|
125
|
if typeMap["userinput"] || typeMap["useroutput"] || (typeMap["*"] && !(excludedTypeMap["userinput"] && excludedTypeMap["useroutput"])) {
|
104
|
|
- logger.DumpingRawInOut = true
|
|
126
|
+ logger.dumpingRawInOut = true
|
105
|
127
|
}
|
106
|
128
|
if sLogger.MethodFile.Enabled {
|
107
|
129
|
file, err := os.OpenFile(sLogger.MethodFile.Filename, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0666)
|
108
|
130
|
if err != nil {
|
109
|
|
- return nil, fmt.Errorf("Could not open log file %s [%s]", sLogger.MethodFile.Filename, err.Error())
|
|
131
|
+ lastErr = fmt.Errorf("Could not open log file %s [%s]", sLogger.MethodFile.Filename, err.Error())
|
110
|
132
|
}
|
111
|
133
|
writer := bufio.NewWriter(file)
|
112
|
134
|
sLogger.MethodFile.File = file
|
|
@@ -115,11 +137,20 @@ func NewManager(config ...Config) (*Manager, error) {
|
115
|
137
|
logger.loggers = append(logger.loggers, sLogger)
|
116
|
138
|
}
|
117
|
139
|
|
118
|
|
- return &logger, nil
|
|
140
|
+ return lastErr
|
|
141
|
+}
|
|
142
|
+
|
|
143
|
+func (logger *Manager) DumpingRawInOut() bool {
|
|
144
|
+ logger.configMutex.RLock()
|
|
145
|
+ defer logger.configMutex.RUnlock()
|
|
146
|
+ return logger.dumpingRawInOut
|
119
|
147
|
}
|
120
|
148
|
|
121
|
149
|
// Log logs the given message with the given details.
|
122
|
150
|
func (logger *Manager) Log(level Level, logType string, messageParts ...string) {
|
|
151
|
+ logger.configMutex.RLock()
|
|
152
|
+ defer logger.configMutex.RUnlock()
|
|
153
|
+
|
123
|
154
|
for _, singleLogger := range logger.loggers {
|
124
|
155
|
singleLogger.Log(level, logType, messageParts...)
|
125
|
156
|
}
|
|
@@ -127,30 +158,22 @@ func (logger *Manager) Log(level Level, logType string, messageParts ...string)
|
127
|
158
|
|
128
|
159
|
// Debug logs the given message as a debug message.
|
129
|
160
|
func (logger *Manager) Debug(logType string, messageParts ...string) {
|
130
|
|
- for _, singleLogger := range logger.loggers {
|
131
|
|
- singleLogger.Log(LogDebug, logType, messageParts...)
|
132
|
|
- }
|
|
161
|
+ logger.Log(LogDebug, logType, messageParts...)
|
133
|
162
|
}
|
134
|
163
|
|
135
|
164
|
// Info logs the given message as an info message.
|
136
|
165
|
func (logger *Manager) Info(logType string, messageParts ...string) {
|
137
|
|
- for _, singleLogger := range logger.loggers {
|
138
|
|
- singleLogger.Log(LogInfo, logType, messageParts...)
|
139
|
|
- }
|
|
166
|
+ logger.Log(LogInfo, logType, messageParts...)
|
140
|
167
|
}
|
141
|
168
|
|
142
|
169
|
// Warning logs the given message as a warning message.
|
143
|
170
|
func (logger *Manager) Warning(logType string, messageParts ...string) {
|
144
|
|
- for _, singleLogger := range logger.loggers {
|
145
|
|
- singleLogger.Log(LogWarning, logType, messageParts...)
|
146
|
|
- }
|
|
171
|
+ logger.Log(LogWarning, logType, messageParts...)
|
147
|
172
|
}
|
148
|
173
|
|
149
|
174
|
// Error logs the given message as an error message.
|
150
|
175
|
func (logger *Manager) Error(logType string, messageParts ...string) {
|
151
|
|
- for _, singleLogger := range logger.loggers {
|
152
|
|
- singleLogger.Log(LogError, logType, messageParts...)
|
153
|
|
- }
|
|
176
|
+ logger.Log(LogError, logType, messageParts...)
|
154
|
177
|
}
|
155
|
178
|
|
156
|
179
|
// Fatal logs the given message as an error message, then exits.
|
|
@@ -179,6 +202,18 @@ type singleLogger struct {
|
179
|
202
|
ExcludedTypes map[string]bool
|
180
|
203
|
}
|
181
|
204
|
|
|
205
|
+func (logger *singleLogger) Close() error {
|
|
206
|
+ if logger.MethodFile.Enabled {
|
|
207
|
+ flushErr := logger.MethodFile.Writer.Flush()
|
|
208
|
+ closeErr := logger.MethodFile.File.Close()
|
|
209
|
+ if flushErr != nil {
|
|
210
|
+ return flushErr
|
|
211
|
+ }
|
|
212
|
+ return closeErr
|
|
213
|
+ }
|
|
214
|
+ return nil
|
|
215
|
+}
|
|
216
|
+
|
182
|
217
|
// Log logs the given message with the given details.
|
183
|
218
|
func (logger *singleLogger) Log(level Level, logType string, messageParts ...string) {
|
184
|
219
|
// no logging enabled
|