Update Alignak rc.d startup script

Alignak-monitoring · Apr 3, 2018 · 80c3a95 · 80c3a95
1 parent 77b9a83
commit 80c3a95
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 11 deletions.
diff --git a/alignak/dispatcher.py b/alignak/dispatcher.py
@@ -232,7 +232,7 @@ def check_reachable(self, forced=False, test=False):
                 result = daemon_link.update_infos(forced=(forced or self.new_to_dispatch),
                                                   test=test)
             except LinkError:
-                logger.warning("Scheduler connection failed, I could not push external commands!")
+                logger.warning("Daemon connection failed, I could not get fresh information.")
 
             if result is not False:
                 if result is None:

diff --git a/bin/rc.d/alignak b/bin/rc.d/alignak
@@ -27,10 +27,6 @@
 #   Default value: "YES"
 #   Start in replace mode - replaces an existing daemon if a stale pid file exists
 #
-# alignak_log_file (string):
-#   Default value: "${alignak_prefix}/var/log/${name}/${name}.log"
-#   Log file name.
-#
 # alignak_pid_file (string):
 #   Default value: "${alignak_prefix}/var/run/${name}/${name}.pid"
 #   PID file name.
@@ -39,6 +35,21 @@
 #   Default value: ""
 #   Extra parameters to be provided to the started script
 #
+# alignak_name (string):
+#   Default value: ""
+#   Alignak instance name
+#   Default is empty to get this parameter in the configuration file
+#
+# alignak_host (string):
+#   Default value: ""
+#   Interface listened to by the Alignak arbiter.
+#   Default is empty to get this parameter in the configuration file
+#
+# alignak_port (integer):
+#   Default value:
+#   Port listened to by the Alignak arbiter.
+#   Default is empty to get this parameter in the configuration file
+#
 
 . /etc/rc.subr
 
@@ -52,19 +63,33 @@ load_rc_config "${name}"
 : ${alignak_configuration="${alignak_prefix}/etc/alignak/alignak.ini"}
 : ${alignak_daemon="YES"}
 : ${alignak_replace="YES"}
+: ${alignak_name=""}
+: ${alignak_host=""}
+: ${alignak_port=""}
 : ${alignak_flags=""}
 
 if checkyesno alignak_daemon; then
-  ${alignak_flags="--environment ${alignak_flags}"}
-  alignak_log_options="--logger file:${alignak_log_file}"
+  ${alignak_flags="${alignak_flags} --daemon"}
+fi
+
+if checkyesno alignak_daemon; then
+  ${alignak_flags="${alignak_flags} --replace"}
+fi
+
+if [ ! -z "$alignak_name" ]; then
+  ${alignak_flags="${alignak_flags} --alignak-name ${alignak_name}"}
+fi
+
+if [ ! -z "$alignak_host" ]; then
+  ${alignak_flags="${alignak_flags} --host ${alignak_host}"}
 fi
 
-if checkyesno alignak_metrics; then
-  alignak_metrics_options="--carbon ${alignak_carbon}"
+if [ ! -z "$alignak_port" ]; then
+  ${alignak_flags="${alignak_flags} --port ${alignak_port}"}
 fi
 
 command="/usr/local/bin/alignak-arbiter"
-command_args="--master --daemonize /dev/null --wsgi-file ${alignak_wsgi} --pidfile ${alignak_pid_file} --http ${alignak_host}:${alignak_port} --processes ${alignak_processes} --uid ${alignak_user} --gid ${alignak_group} ${alignak_log_options} ${alignak_metrics_options}"
+command_args=="--environment ${alignak_configuration} ${alignak_flags}"}
 
 stop_cmd="${name}_stop"
 start_cmd="${name}_start"
@@ -81,7 +106,7 @@ alignak_precmd()
 alignak_start()
 {
     echo "Starting ${name}..."
-    /usr/local/bin/uwsgi ${command_args}
+    ${command} ${command_args}
     echo "Started"
 }