mirror of
https://github.com/go-gitea/gitea.git
synced 2024-08-25 21:44:20 -04:00
* Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
122 lines
2.4 KiB
Go
122 lines
2.4 KiB
Go
// Copyright 2014 The Gogs Authors. All rights reserved.
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package log
|
|
|
|
import (
|
|
"encoding/json"
|
|
"io"
|
|
"net"
|
|
)
|
|
|
|
type connWriter struct {
|
|
innerWriter io.WriteCloser
|
|
ReconnectOnMsg bool `json:"reconnectOnMsg"`
|
|
Reconnect bool `json:"reconnect"`
|
|
Net string `json:"net"`
|
|
Addr string `json:"addr"`
|
|
}
|
|
|
|
// Close the inner writer
|
|
func (i *connWriter) Close() error {
|
|
if i.innerWriter != nil {
|
|
return i.innerWriter.Close()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// Write the data to the connection
|
|
func (i *connWriter) Write(p []byte) (int, error) {
|
|
if i.neededConnectOnMsg() {
|
|
if err := i.connect(); err != nil {
|
|
return 0, err
|
|
}
|
|
}
|
|
|
|
if i.ReconnectOnMsg {
|
|
defer i.innerWriter.Close()
|
|
}
|
|
|
|
return i.innerWriter.Write(p)
|
|
}
|
|
|
|
func (i *connWriter) neededConnectOnMsg() bool {
|
|
if i.Reconnect {
|
|
i.Reconnect = false
|
|
return true
|
|
}
|
|
|
|
if i.innerWriter == nil {
|
|
return true
|
|
}
|
|
|
|
return i.ReconnectOnMsg
|
|
}
|
|
|
|
func (i *connWriter) connect() error {
|
|
if i.innerWriter != nil {
|
|
i.innerWriter.Close()
|
|
i.innerWriter = nil
|
|
}
|
|
|
|
conn, err := net.Dial(i.Net, i.Addr)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if tcpConn, ok := conn.(*net.TCPConn); ok {
|
|
tcpConn.SetKeepAlive(true)
|
|
}
|
|
|
|
i.innerWriter = conn
|
|
return nil
|
|
}
|
|
|
|
// ConnLogger implements LoggerProvider.
|
|
// it writes messages in keep-live tcp connection.
|
|
type ConnLogger struct {
|
|
BaseLogger
|
|
ReconnectOnMsg bool `json:"reconnectOnMsg"`
|
|
Reconnect bool `json:"reconnect"`
|
|
Net string `json:"net"`
|
|
Addr string `json:"addr"`
|
|
}
|
|
|
|
// NewConn creates new ConnLogger returning as LoggerProvider.
|
|
func NewConn() LoggerProvider {
|
|
conn := new(ConnLogger)
|
|
conn.Level = TRACE
|
|
return conn
|
|
}
|
|
|
|
// Init inits connection writer with json config.
|
|
// json config only need key "level".
|
|
func (log *ConnLogger) Init(jsonconfig string) error {
|
|
err := json.Unmarshal([]byte(jsonconfig), log)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
log.createLogger(&connWriter{
|
|
ReconnectOnMsg: log.ReconnectOnMsg,
|
|
Reconnect: log.Reconnect,
|
|
Net: log.Net,
|
|
Addr: log.Addr,
|
|
}, log.Level)
|
|
return nil
|
|
}
|
|
|
|
// Flush does nothing for this implementation
|
|
func (log *ConnLogger) Flush() {
|
|
}
|
|
|
|
// GetName returns the default name for this implementation
|
|
func (log *ConnLogger) GetName() string {
|
|
return "conn"
|
|
}
|
|
|
|
func init() {
|
|
Register("conn", NewConn)
|
|
}
|