diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nshd/hackers_git/hackers.go | 6 | ||||
| -rw-r--r-- | src/nshd/hackers_git/hackers_watch.go | 4 | ||||
| -rw-r--r-- | src/nslcd_systemd/nslcd_systemd.go | 19 |
3 files changed, 15 insertions, 14 deletions
diff --git a/src/nshd/hackers_git/hackers.go b/src/nshd/hackers_git/hackers.go index f47868f..1eca0f6 100644 --- a/src/nshd/hackers_git/hackers.go +++ b/src/nshd/hackers_git/hackers.go @@ -42,21 +42,21 @@ var _ nslcd_proto.Backend = &Hackers{} func (o *Hackers) Init() error { err := o.Reload() if err != nil { - logger.Err("Could not initialize hackers.git: %v", err) + logger.Err("hackers.git: Could not initialize: %v", err) return err } return nil } func (o *Hackers) Close() { - logger.Info("Closing hackers.git session") + logger.Info("hackers.git: Closing session") o.lock.Lock() defer o.lock.Unlock() o.close() } func (o *Hackers) Reload() error { - logger.Info("Loading hackers.git session") + logger.Info("hackers.git: Loading session") o.lock.Lock() defer o.lock.Unlock() diff --git a/src/nshd/hackers_git/hackers_watch.go b/src/nshd/hackers_git/hackers_watch.go index 666237b..0fa45c9 100644 --- a/src/nshd/hackers_git/hackers_watch.go +++ b/src/nshd/hackers_git/hackers_watch.go @@ -220,14 +220,14 @@ Loop: }() } } else { - logger.Debug("hackers.git: event didn't match: %#v", event) + logger.Debug("hackers.git: Event didn't match: %#v", event) } } case err, ok := <-o.in_fd.Errors: if !ok { break Loop } - logger.Warning("hackers.git: inotify error: %v", err) + logger.Warning("hackers.git: Inotify error: %v", err) } } logger.Info("hackers.git: Stopped inotify watcher") diff --git a/src/nslcd_systemd/nslcd_systemd.go b/src/nslcd_systemd/nslcd_systemd.go index 6fb29a9..7caee26 100644 --- a/src/nslcd_systemd/nslcd_systemd.go +++ b/src/nslcd_systemd/nslcd_systemd.go @@ -25,11 +25,11 @@ func get_socket() (socket net.Listener, err error) { err = nil fds := sd.ListenFds(true) if fds == nil { - err = fmt.Errorf("failed to aquire sockets from systemd") + err = fmt.Errorf("Failed to aquire sockets from systemd") return } if len(fds) != 1 { - err = fmt.Errorf("wrong number of sockets from systemd: expected %d but got %d", 1, len(fds)) + err = fmt.Errorf("Wrong number of sockets from systemd: expected %d but got %d", 1, len(fds)) return } socket, err = net.FileListener(fds[0]) @@ -52,14 +52,14 @@ func handler(conn *net.UnixConn, backend nslcd_proto.Backend) { defer conn.Close() cred, err := getpeercred(conn) if err != nil { - logger.Debug("connection from unknown client") + logger.Debug("Connection from unknown client") } else { - logger.Debug("connection from pid=%v uid=%v gid=%v", + logger.Debug("Connection from pid=%v uid=%v gid=%v", cred.Pid, cred.Uid, cred.Gid) } err = nslcd_proto.HandleRequest(backend, conn, conn, cred) if err != nil { - logger.Debug("Error while handling request: %v", err) + logger.Notice("Error while handling request: %v", err) } } @@ -79,7 +79,7 @@ func Main(backend Backend) uint8 { err = backend.Init() if err != nil { - logger.Err("%s", err.Error()) + logger.Err("Could not initialize backend: %v", err) sd.Notify(false, "STOPPING=1") return lsb.EXIT_FAILURE } @@ -87,7 +87,7 @@ func Main(backend Backend) uint8 { socket, err = get_socket() if err != nil { - logger.Err("%s", err.Error()) + logger.Err("%v", err) sd.Notify(false, "STOPPING=1") return lsb.EXIT_NOTRUNNING } @@ -97,7 +97,7 @@ func Main(backend Backend) uint8 { for { conn, err := socket.Accept() if err != nil { - logger.Notice("Accept: %s", err.Error()) + logger.Notice("Could not accept connection: %v", err) } sock <- conn.(*net.UnixConn) } @@ -112,12 +112,13 @@ Loop: case sig := <-sigs: switch sig { case syscall.SIGTERM: + logger.Notice("Received SIGTERM, shutting down") break Loop case syscall.SIGHUP: sd.Notify(false, "RELOADING=1") err := backend.Reload() if err != nil { - logger.Notice("Reload: %s", err.Error()) + logger.Notice("Could not reload backend: %s", err.Error()) exit = lsb.EXIT_NOTRUNNING break Loop } |