From ee165667d271b29eef70c9726bf6af45778cb470 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Tue, 1 Sep 2015 10:41:18 -0600
Subject: Finish the hackers.git parser

---
 src/nshd/hackers_git/hackers_watch.go | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

(limited to 'src/nshd/hackers_git/hackers_watch.go')

diff --git a/src/nshd/hackers_git/hackers_watch.go b/src/nshd/hackers_git/hackers_watch.go
index be4af40..1b4f08d 100644
--- a/src/nshd/hackers_git/hackers_watch.go
+++ b/src/nshd/hackers_git/hackers_watch.go
@@ -72,20 +72,20 @@ func (o *Hackers) reload() (err error) {
 	o.in_wd_home, err = o.in_fd.AddWatch("/home"      , in_DIR|in_CHILD_ADD); if err != nil { return }
 	o.in_wd_yaml, err = o.in_fd.AddWatch(o.cfg.Yamldir, in_DIR|in_CHILD_ANY); if err != nil { return }
 
-	files, err := filepath.Glob(o.cfg.Yamldir + "/*.yml")
-	o.users = make(map[int32]user, len(files))
-	o.in_uid2wd = make(map[int32]inotify.Cint, len(files))
-	o.in_wd2uid = make(map[inotify.Cint]int32, len(files))
-	for _, file := range files {
-		logger.Debug("Loading yaml file: %s", file)
-		user, err := load_user_yaml(file)
+	filenames, err := filepath.Glob(o.cfg.Yamldir + "/*.yml")
+	o.users = make(map[int32]user, len(filenames))
+	o.in_uid2wd = make(map[int32]inotify.Cint, len(filenames))
+	o.in_wd2uid = make(map[inotify.Cint]int32, len(filenames))
+	for _, filename := range filenames {
+		logger.Info("Loading yaml file: %s", filename)
+		user, err := load_user_yaml(filename)
 		if err == nil {
 			o.users[user.passwd.UID] = user
-			logger.Debug("... success")
+			logger.Info("... success")
 			o.watchHomedir(user.passwd.UID)
 			o.passwords[user.passwd.UID] = load_user_password(user.passwd.HomeDir + "/.password")
 		} else {
-			logger.Debug("... error")
+			logger.Info("... error: %v", err)
 		}
 	}
 
@@ -151,12 +151,16 @@ func (o *Hackers) worker() {
 					worker_error("failed to load %q: %v", o.cfg.Yamldir, err)
 				}
 			} else if event.Mask&in_CHILD_ANY != 0 {
-				user, err := load_user_yaml(*event.Name)
+				filename := o.cfg.Yamldir + "/" + *event.Name
+				logger.Info("Loading yaml file: %s", filename)
+				user, err := load_user_yaml(filename)
 				if err == nil {
 					// User added/updated
+					logger.Info("... success")
 					o.worker_handle_user_add(user)
 				} else if user.passwd.UID >= 0 {
 					// User became invalid
+					logger.Info("... error: %v", err)
 					o.worker_handle_user_del(user.passwd.UID)
 				}
 			} else {
-- 
cgit v1.2.2