summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2014-07-26 18:37:18 -0400
committerUnknwon <joe2010xtmf@163.com>2014-07-26 18:37:18 -0400
commit5e8138341357f367868a32b631495c9d5a286477 (patch)
treefb36040422534e051ac381cde594ff1a208e4195 /modules
parent02a81ddb6252d1a08900d548ddb63e41bcb0b8ef (diff)
downloadgitea-5e8138341357f367868a32b631495c9d5a286477.tar.gz
gitea-5e8138341357f367868a32b631495c9d5a286477.zip
Git installation check, show image in single file view, show short SHA1 instead of 40-length string, complete log module
Diffstat (limited to 'modules')
-rw-r--r--modules/log/conn.go104
-rw-r--r--modules/log/console.go6
-rw-r--r--modules/log/database.go68
-rw-r--r--modules/log/log.go16
-rw-r--r--modules/log/smtp.go87
5 files changed, 270 insertions, 11 deletions
diff --git a/modules/log/conn.go b/modules/log/conn.go
new file mode 100644
index 0000000000..c104a16c93
--- /dev/null
+++ b/modules/log/conn.go
@@ -0,0 +1,104 @@
+// Copyright 2014 The Gogs 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"
+ "log"
+ "net"
+)
+
+// ConnWriter implements LoggerInterface.
+// it writes messages in keep-live tcp connection.
+type ConnWriter struct {
+ lg *log.Logger
+ innerWriter io.WriteCloser
+ ReconnectOnMsg bool `json:"reconnectOnMsg"`
+ Reconnect bool `json:"reconnect"`
+ Net string `json:"net"`
+ Addr string `json:"addr"`
+ Level int `json:"level"`
+}
+
+// create new ConnWrite returning as LoggerInterface.
+func NewConn() LoggerInterface {
+ conn := new(ConnWriter)
+ conn.Level = TRACE
+ return conn
+}
+
+// init connection writer with json config.
+// json config only need key "level".
+func (cw *ConnWriter) Init(jsonconfig string) error {
+ return json.Unmarshal([]byte(jsonconfig), cw)
+}
+
+// write message in connection.
+// if connection is down, try to re-connect.
+func (cw *ConnWriter) WriteMsg(msg string, skip, level int) error {
+ if cw.Level > level {
+ return nil
+ }
+ if cw.neddedConnectOnMsg() {
+ if err := cw.connect(); err != nil {
+ return err
+ }
+ }
+
+ if cw.ReconnectOnMsg {
+ defer cw.innerWriter.Close()
+ }
+ cw.lg.Println(msg)
+ return nil
+}
+
+func (_ *ConnWriter) Flush() {
+}
+
+// destroy connection writer and close tcp listener.
+func (cw *ConnWriter) Destroy() {
+ if cw.innerWriter == nil {
+ return
+ }
+ cw.innerWriter.Close()
+}
+
+func (cw *ConnWriter) connect() error {
+ if cw.innerWriter != nil {
+ cw.innerWriter.Close()
+ cw.innerWriter = nil
+ }
+
+ conn, err := net.Dial(cw.Net, cw.Addr)
+ if err != nil {
+ return err
+ }
+
+ if tcpConn, ok := conn.(*net.TCPConn); ok {
+ tcpConn.SetKeepAlive(true)
+ }
+
+ cw.innerWriter = conn
+ cw.lg = log.New(conn, "", log.Ldate|log.Ltime)
+ return nil
+}
+
+func (cw *ConnWriter) neddedConnectOnMsg() bool {
+ if cw.Reconnect {
+ cw.Reconnect = false
+ return true
+ }
+
+ if cw.innerWriter == nil {
+ return true
+ }
+
+ return cw.ReconnectOnMsg
+}
+
+func init() {
+ Register("conn", NewConn)
+}
diff --git a/modules/log/console.go b/modules/log/console.go
index 92d6c2a406..f5a8b96fd7 100644
--- a/modules/log/console.go
+++ b/modules/log/console.go
@@ -61,13 +61,13 @@ func (cw *ConsoleWriter) WriteMsg(msg string, skip, level int) error {
return nil
}
-func (_ *ConsoleWriter) Destroy() {
-}
-
func (_ *ConsoleWriter) Flush() {
}
+func (_ *ConsoleWriter) Destroy() {
+}
+
func init() {
Register("console", NewConsole)
}
diff --git a/modules/log/database.go b/modules/log/database.go
new file mode 100644
index 0000000000..5857cb6d66
--- /dev/null
+++ b/modules/log/database.go
@@ -0,0 +1,68 @@
+// Copyright 2014 The Gogs 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"
+
+ "github.com/go-xorm/xorm"
+)
+
+type Log struct {
+ Id int64
+ Level int
+ Msg string `xorm:"TEXT"`
+}
+
+// DatabaseWriter implements LoggerInterface and is used to log into database.
+type DatabaseWriter struct {
+ Driver string `json:"driver"`
+ Conn string `json:"conn"`
+ Level int `json:"level"`
+ x *xorm.Engine
+}
+
+func NewDatabase() LoggerInterface {
+ return &DatabaseWriter{Level: TRACE}
+}
+
+// init database writer with json config.
+// config like:
+// {
+// "driver": "mysql"
+// "conn":"root:root@tcp(127.0.0.1:3306)/gogs?charset=utf8",
+// "level": 0
+// }
+// connection string is based on xorm.
+func (d *DatabaseWriter) Init(jsonconfig string) (err error) {
+ if err = json.Unmarshal([]byte(jsonconfig), d); err != nil {
+ return err
+ }
+ d.x, err = xorm.NewEngine(d.Driver, d.Conn)
+ if err != nil {
+ return err
+ }
+ return d.x.Sync(new(Log))
+}
+
+// write message in database writer.
+func (d *DatabaseWriter) WriteMsg(msg string, skip, level int) error {
+ if level < d.Level {
+ return nil
+ }
+
+ _, err := d.x.Insert(&Log{Level: level, Msg: msg})
+ return err
+}
+
+func (_ *DatabaseWriter) Flush() {
+}
+
+func (_ *DatabaseWriter) Destroy() {
+}
+
+func init() {
+ Register("database", NewDatabase)
+}
diff --git a/modules/log/log.go b/modules/log/log.go
index 6ca6b5b0b1..00f777e72a 100644
--- a/modules/log/log.go
+++ b/modules/log/log.go
@@ -87,12 +87,12 @@ func Fatal(skip int, format string, v ...interface{}) {
os.Exit(1)
}
-// .___ _______________________________________________________ _________ ___________
-// | |\ \__ ___/\_ _____/\______ \_ _____/ _ \ \_ ___ \\_ _____/
-// | |/ | \| | | __)_ | _/| __)/ /_\ \/ \ \/ | __)_
-// | / | \ | | \ | | \| \/ | \ \____| \
-// |___\____|__ /____| /_______ / |____|_ /\___ /\____|__ /\______ /_______ /
-// \/ \/ \/ \/ \/ \/ \/
+// .___ __ _____
+// | | _____/ |_ ____________/ ____\____ ____ ____
+// | |/ \ __\/ __ \_ __ \ __\\__ \ _/ ___\/ __ \
+// | | | \ | \ ___/| | \/| | / __ \\ \__\ ___/
+// |___|___| /__| \___ >__| |__| (____ /\___ >___ >
+// \/ \/ \/ \/ \/
type LogLevel int
@@ -168,7 +168,7 @@ func (l *Logger) SetLogger(adapter string, config string) error {
l.outputs[adapter] = lg
l.adapter = adapter
} else {
- panic("log: unknown adapter \"" + adapter + "\" (forgotten Register?)")
+ panic("log: unknown adapter \"" + adapter + "\" (forgotten register?)")
}
return nil
}
@@ -181,7 +181,7 @@ func (l *Logger) DelLogger(adapter string) error {
lg.Destroy()
delete(l.outputs, adapter)
} else {
- panic("log: unknown adapter \"" + adapter + "\" (forgotten Register?)")
+ panic("log: unknown adapter \"" + adapter + "\" (forgotten register?)")
}
return nil
}
diff --git a/modules/log/smtp.go b/modules/log/smtp.go
new file mode 100644
index 0000000000..0a10e56a63
--- /dev/null
+++ b/modules/log/smtp.go
@@ -0,0 +1,87 @@
+// Copyright 2014 The Gogs 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"
+ "fmt"
+ "net/smtp"
+ "strings"
+ "time"
+)
+
+const (
+ subjectPhrase = "Diagnostic message from server"
+)
+
+// smtpWriter implements LoggerInterface and is used to send emails via given SMTP-server.
+type SmtpWriter struct {
+ Username string `json:"Username"`
+ Password string `json:"password"`
+ Host string `json:"Host"`
+ Subject string `json:"subject"`
+ RecipientAddresses []string `json:"sendTos"`
+ Level int `json:"level"`
+}
+
+// create smtp writer.
+func NewSmtpWriter() LoggerInterface {
+ return &SmtpWriter{Level: TRACE}
+}
+
+// init smtp writer with json config.
+// config like:
+// {
+// "Username":"example@gmail.com",
+// "password:"password",
+// "host":"smtp.gmail.com:465",
+// "subject":"email title",
+// "sendTos":["email1","email2"],
+// "level":LevelError
+// }
+func (sw *SmtpWriter) Init(jsonconfig string) error {
+ return json.Unmarshal([]byte(jsonconfig), sw)
+}
+
+// write message in smtp writer.
+// it will send an email with subject and only this message.
+func (s *SmtpWriter) WriteMsg(msg string, skip, level int) error {
+ if level < s.Level {
+ return nil
+ }
+
+ hp := strings.Split(s.Host, ":")
+
+ // Set up authentication information.
+ auth := smtp.PlainAuth(
+ "",
+ s.Username,
+ s.Password,
+ hp[0],
+ )
+ // Connect to the server, authenticate, set the sender and recipient,
+ // and send the email all in one step.
+ content_type := "Content-Type: text/plain" + "; charset=UTF-8"
+ mailmsg := []byte("To: " + strings.Join(s.RecipientAddresses, ";") + "\r\nFrom: " + s.Username + "<" + s.Username +
+ ">\r\nSubject: " + s.Subject + "\r\n" + content_type + "\r\n\r\n" + fmt.Sprintf(".%s", time.Now().Format("2006-01-02 15:04:05")) + msg)
+
+ return smtp.SendMail(
+ s.Host,
+ auth,
+ s.Username,
+ s.RecipientAddresses,
+ mailmsg,
+ )
+}
+
+func (_ *SmtpWriter) Flush() {
+}
+
+func (_ *SmtpWriter) Destroy() {
+}
+
+func init() {
+ Register("smtp", NewSmtpWriter)
+}