diff options
Diffstat (limited to 'src/pkg/syslog/syslog.go')
| -rw-r--r-- | src/pkg/syslog/syslog.go | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/src/pkg/syslog/syslog.go b/src/pkg/syslog/syslog.go index ef17e6862..527321f57 100644 --- a/src/pkg/syslog/syslog.go +++ b/src/pkg/syslog/syslog.go @@ -9,10 +9,10 @@ package syslog import ( - "fmt"; - "log"; - "net"; - "os"; + "fmt" + "log" + "net" + "os" ) type Priority int @@ -20,21 +20,21 @@ type Priority int const ( // From /usr/include/sys/syslog.h. // These are the same on Linux, BSD, and OS X. - LOG_EMERG Priority = iota; - LOG_ALERT; - LOG_CRIT; - LOG_ERR; - LOG_WARNING; - LOG_NOTICE; - LOG_INFO; - LOG_DEBUG; + LOG_EMERG Priority = iota + LOG_ALERT + LOG_CRIT + LOG_ERR + LOG_WARNING + LOG_NOTICE + LOG_INFO + LOG_DEBUG ) // A Writer is a connection to a syslog server. type Writer struct { - priority Priority; - prefix string; - conn net.Conn; + priority Priority + prefix string + conn net.Conn } // New establishes a new connection to the system log daemon. @@ -52,23 +52,23 @@ func Dial(network, raddr string, priority Priority, prefix string) (w *Writer, e if prefix == "" { prefix = os.Args[0] } - var conn net.Conn; + var conn net.Conn if network == "" { conn, err = unixSyslog() } else { conn, err = net.Dial(network, "", raddr) } - return &Writer{priority, prefix, conn}, err; + return &Writer{priority, prefix, conn}, err } func unixSyslog() (conn net.Conn, err os.Error) { - logTypes := []string{"unixgram", "unix"}; - logPaths := []string{"/dev/log", "/var/run/syslog"}; - var raddr string; + logTypes := []string{"unixgram", "unix"} + logPaths := []string{"/dev/log", "/var/run/syslog"} + var raddr string for _, network := range logTypes { for _, path := range logPaths { - raddr = path; - conn, err := net.Dial(network, "", raddr); + raddr = path + conn, err := net.Dial(network, "", raddr) if err != nil { continue } else { @@ -76,7 +76,7 @@ func unixSyslog() (conn net.Conn, err os.Error) { } } } - return nil, os.ErrorString("Unix syslog delivery error"); + return nil, os.ErrorString("Unix syslog delivery error") } // Write sends a log message to the syslog daemon. @@ -84,51 +84,51 @@ func (w *Writer) Write(b []byte) (int, os.Error) { if w.priority > LOG_DEBUG || w.priority < LOG_EMERG { return 0, os.EINVAL } - return fmt.Fprintf(w.conn, "<%d>%s: %s\n", w.priority, w.prefix, b); + return fmt.Fprintf(w.conn, "<%d>%s: %s\n", w.priority, w.prefix, b) } func (w *Writer) writeString(p Priority, s string) (int, os.Error) { return fmt.Fprintf(w.conn, "<%d>%s: %s\n", p, w.prefix, s) } -func (w *Writer) Close() os.Error { return w.conn.Close() } +func (w *Writer) Close() os.Error { return w.conn.Close() } // Emerg logs a message using the LOG_EMERG priority. func (w *Writer) Emerg(m string) (err os.Error) { - _, err = w.writeString(LOG_EMERG, m); - return err; + _, err = w.writeString(LOG_EMERG, m) + return err } // Crit logs a message using the LOG_CRIT priority. func (w *Writer) Crit(m string) (err os.Error) { - _, err = w.writeString(LOG_CRIT, m); - return err; + _, err = w.writeString(LOG_CRIT, m) + return err } // ERR logs a message using the LOG_ERR priority. func (w *Writer) Err(m string) (err os.Error) { - _, err = w.writeString(LOG_ERR, m); - return err; + _, err = w.writeString(LOG_ERR, m) + return err } // Warning logs a message using the LOG_WARNING priority. func (w *Writer) Warning(m string) (err os.Error) { - _, err = w.writeString(LOG_WARNING, m); - return err; + _, err = w.writeString(LOG_WARNING, m) + return err } // Notice logs a message using the LOG_NOTICE priority. func (w *Writer) Notice(m string) (err os.Error) { - _, err = w.writeString(LOG_NOTICE, m); - return err; + _, err = w.writeString(LOG_NOTICE, m) + return err } // Info logs a message using the LOG_INFO priority. func (w *Writer) Info(m string) (err os.Error) { - _, err = w.writeString(LOG_INFO, m); - return err; + _, err = w.writeString(LOG_INFO, m) + return err } // Debug logs a message using the LOG_DEBUG priority. func (w *Writer) Debug(m string) (err os.Error) { - _, err = w.writeString(LOG_DEBUG, m); - return err; + _, err = w.writeString(LOG_DEBUG, m) + return err } // NewLogger provides an object that implements the full log.Logger interface, @@ -136,9 +136,9 @@ func (w *Writer) Debug(m string) (err os.Error) { // priority will be used for all messages sent using this interface. // All messages are logged with priority p. func NewLogger(p Priority, flag int) *log.Logger { - s, err := New(p, ""); + s, err := New(p, "") if err != nil { return nil } - return log.New(s, nil, "", flag); + return log.New(s, nil, "", flag) } |
