Reorg and some fixes.

Author: apdynai

etc/managerd.service

@@ -12,17 +12,18 @@ var (
 
 type Config struct {
     Watcher struct {
-        Interval    string     `yaml:"interval"` //, envconfig:"SERVER_PORT"`
-        Mode        string  `yaml:"mode"` // APP,PROCESS,THREAD,ALL
+        Interval    string     `yaml:"interval"`
+        Mode        string  `yaml:"mode"` 
+        Enabled     bool  `yaml:"enabled"` 
     } `yaml:"watcher"`
     Scanner struct {
-        Targets []string `yaml:"targets"` //, envconfig:"DB_USERNAME"`
+        Targets []string `yaml:"targets"`
         Interval string `yaml:"interval"`
         Directory string `yaml:"directory"`
         Exclusions []string `yaml:"exclusions"`
         Opts []string `yaml:"opts"`
     } `yaml:"scanner"`
-    Roles []string `yaml:"roles"`       //, envconfig:"DYNMGR_ROLES"
+    Roles []string `yaml:"roles"`      
     LogLevel string `yaml:"log_level"`
     LogDir string `yaml:"log_dir"`
 }

pkg/conf/conf.go

@@ -23,6 +23,7 @@ type Logger struct {
 
 var (
 	LogDir = ""
+	DefaultLogDir = "/var/log/dynamite/dynamited"
 )
 
 // Try to use or create the provided logging dir 
@@ -39,23 +40,30 @@ func LogDirIsUsable(s string)(bool){
 	return true 
 }
 
+func MakeDefLogDir()(bool) {
+	if LogDirIsUsable(DefaultLogDir) {
+		LogDir = DefaultLogDir
+		return true
+	} else {
+		fmt.Println("Unable to create default logging directory.")
+	}
+	return false
+}
+
 func Init()(bool){
 	// Ensure the log directory exists, try to create it if not 
 	if conf.Conf.LogDir != "" {
 		if LogDirIsUsable(conf.Conf.LogDir) {
 			LogDir = conf.Conf.LogDir
 			return true
-		}
-	} else {
-		fmt.Println("No logging directory configured, attempting to use default /var/dynamite/managerd/logs")
-		// try a default path
-		if LogDirIsUsable("/var/dynamite/managerd/logs") {
-			LogDir = "/var/dynamite/managerd/logs"
-			return true
 		} else {
-			fmt.Println("Unable to configure logging. Exiting.")
-			return false
+			fmt.Println("Unable to use configured logging directory, attempting to use", DefaultLogDir)
+			return MakeDefLogDir()
 		}
+	} else {
+		fmt.Println("No logging directory configured, attempting to use", DefaultLogDir)
+		// try the default path
+		return MakeDefLogDir()
 	}
 	return false
 }

pkg/conf/config.yml

@@ -0,0 +1,16 @@
+[Unit]
+Description=Dynamite Daemon Manager
+Wants=network-online.target
+After=network-online.target
+
+[Service]
+Environment="DYND_CONFIG=-c /etc/dynamite/dynamited/config.yml" 
+PIDFile=/var/run/dynamite/dynamited/dynamited.pid
+ExecStart=/opt/dynamite/dynamited/bin/dynamited $DYND_CONFIG
+Restart=always
+StandardOutput=syslog
+StandardError=syslog
+SyslogIdentifier=dynamited
+
+[Install]
+WantedBy=multi-user.target

pkg/logging/logging.go

@@ -1,27 +1,26 @@
 #!/usr/bin/sh
-echo "Installing managerd..."
+echo "Installing dynamited..."
 # app directories
-MNGRD_LOGS="/var/dynamite/managerd/logs"
-MNGRD_APP="/opt/dynamite/managerd/bin"
-MNGRD_CONF="/etc/dynamite/managerd"
-MNGRD_PID="/var/run/dynamite/managerd"
+DYND_LOGS="/var/dynamite/dynamited/logs"
+DYND_APP="/opt/dynamite/dynamited/bin"
+DYND_CONF="/etc/dynamite/dynamited"
+DYND_PID="/var/run/dynamite/dynamited"
 
 # create dirs 
 echo "Creating application directories..."
-mkdir -p $MNGRD_APP
-mkdir -p $MNGRD_CONF
-mkdir -p $MNGRD_LOGS
-mkdir -p $MNGRD_PID
+mkdir -p $DYND_APP
+mkdir -p $DYND_CONF
+mkdir -p $DYND_LOGS
+mkdir -p $DYND_PID
 
 # place files 
 echo "Installing application files..."
-cp ../cmd/managerd $MNGRD_APP/.
-chmod +x $MNGRD_APP/managerd
-cp ../internal/conf/config.yml $MNGRD_CONF/.
-cp ../etc/managerd.service /etc/systemd/system/.
+cp ../pkg/conf/config.yml $DYND_CONF/.
+cp ../systemd/dynamited.service /etc/systemd/system/.
 
-# set up managerd service 
-echo "Enabling managerd service..."
+# set up dynamited service 
+echo "Enabling dynamited service..."
 systemctl daemon-reload 
-systemctl enable managerd.service
+systemctl enable dynamited.service
 
+echo "Dynamited service installed. Run `systemctl start dynamited` to start."