diff --git a/data/etc/revpipyload/revpipyload.conf b/data/etc/revpipyload/revpipyload.conf index 72dae75..0573bf6 100644 --- a/data/etc/revpipyload/revpipyload.conf +++ b/data/etc/revpipyload/revpipyload.conf @@ -25,8 +25,8 @@ bindip = * [MQTT] mqtt = 0 -basetopic = revpi01 -sendinterval = 30 +basetopic = revpi0000 +sendinterval = 15 send_on_event = 0 write_outputs = 0 broker_address = localhost diff --git a/debian/revpipyload.default b/debian/revpipyload.default index 90c89b5..41d49e5 100644 --- a/debian/revpipyload.default +++ b/debian/revpipyload.default @@ -7,8 +7,5 @@ # # Additional options that are passed to the Daemon. -# For verbose logging add a -v or -vv -DAEMON_ARGS="-d" - -# Codepage for Python (do not change) -export LANG=C.UTF-8 +# For verbose logging add -v or -vv +DAEMON_ARGS="" diff --git a/debian/revpipyload.init b/debian/revpipyload.init index fa2f8e0..8cbad9f 100755 --- a/debian/revpipyload.init +++ b/debian/revpipyload.init @@ -5,18 +5,18 @@ # Required-Stop: $remote_fs $syslog $piControl # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: RevPiPyLoad to execute python plc program +# Short-Description: PLC services for RevolutionPi # Description: This file manages the RevPiPyLoad on system -# boot. The Loader starts your python plc program and -# check whether it is running. +# boot. The Loader starts and monitors your python plc +# program and other PLC services. ### END INIT INFO # Author: Akira Naru Takizawa PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC="RevPiPyLoad to run plc program" +DESC="PLC services for RevolutionPi" NAME=revpipyload -DAEMON_ARGS="-d" +DAEMON_ARGS="" PIDFILE=/var/run/$NAME.pid SCRIPTNAME=/etc/init.d/$NAME DAEMON=/usr/share/revpipyload/revpipyload.py @@ -35,6 +35,9 @@ DAEMON=/usr/share/revpipyload/revpipyload.py # and status_of_proc is working. . /lib/lsb/init-functions +# Codepage for Python (do not change) +export LANG=C.UTF-8 + # # Function that starts the daemon/service # @@ -44,11 +47,8 @@ do_start() # 0 if daemon has been started # 1 if daemon was already running # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- -d $DAEMON_ARGS || return 2 } # @@ -98,7 +98,7 @@ case "$1" in status) status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? ;; - reload) + reload|force-reload) log_daemon_msg "Reloading $DESC" "$NAME" do_reload log_end_msg $?