From 60d521a88af183953ae3c2dff6fae946fa2a5c36 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 5 Apr 2012 20:42:15 -0400 Subject: [PATCH] CC-3575: Use invoke-rc.d to start and stop services, rather than calling init scripts directly -done --- install_minimal/airtime-install | 6 +++--- install_minimal/include/airtime-initialize.sh | 2 +- .../install/media-monitor-initialize.py | 7 ++----- .../install/media-monitor-uninitialize.py | 2 +- .../install/media-monitor-uninstall.py | 2 +- python_apps/pypo/install/pypo-initialize.py | 13 ++----------- python_apps/pypo/install/pypo-uninitialize.py | 2 +- python_apps/pypo/install/pypo-uninstall.py | 2 +- 8 files changed, 12 insertions(+), 24 deletions(-) diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index 6b54a9573..c40d90cff 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -126,13 +126,13 @@ fi #We don't want any of our python services running if we are doing an upgrade/reinstall. #They will be automatically restarted later on. if [ -e /etc/init.d/airtime-media-monitor ]; then - /etc/init.d/airtime-media-monitor stop > /dev/null 2>&1 + invoke-rc.d airtime-media-monitor stop > /dev/null 2>&1 fi if [ -e /etc/init.d/airtime-playout ]; then - /etc/init.d/airtime-playout stop > /dev/null 2>&1 + invoke-rc.d airtime-playout stop > /dev/null 2>&1 fi if [ -e /etc/init.d/airtime-show-recorder ]; then - /etc/init.d/airtime-show-recorder stop > /dev/null 2>&1 + invoke-rc.d airtime-show-recorder stop > /dev/null 2>&1 fi diff --git a/install_minimal/include/airtime-initialize.sh b/install_minimal/include/airtime-initialize.sh index 82b03ee88..a709c50c7 100755 --- a/install_minimal/include/airtime-initialize.sh +++ b/install_minimal/include/airtime-initialize.sh @@ -46,7 +46,7 @@ fi # so we can ensure they can register with monit to monitor them when they start. # If monit is already running, this step is still useful as we need monit to # reload its config files. -/etc/init.d/monit restart +invoke-rc.d monit restart #give monit some time to boot-up before issuing commands sleep 1 diff --git a/python_apps/media-monitor/install/media-monitor-initialize.py b/python_apps/media-monitor/install/media-monitor-initialize.py index b4eb7a581..4f7c7391d 100644 --- a/python_apps/media-monitor/install/media-monitor-initialize.py +++ b/python_apps/media-monitor/install/media-monitor-initialize.py @@ -14,11 +14,8 @@ try: #Start media-monitor daemon print "* Waiting for media-monitor processes to start..." - """ - p = Popen("/etc/init.d/airtime-media-monitor stop", shell=True) - sts = os.waitpid(p.pid, 0)[1] - """ - p = Popen("/etc/init.d/airtime-media-monitor start-no-monit", shell=True) + + p = Popen("invoke-rc.d airtime-media-monitor start-no-monit", shell=True) sts = os.waitpid(p.pid, 0)[1] except Exception, e: print e diff --git a/python_apps/media-monitor/install/media-monitor-uninitialize.py b/python_apps/media-monitor/install/media-monitor-uninitialize.py index f147673c8..a7cca67dc 100644 --- a/python_apps/media-monitor/install/media-monitor-uninitialize.py +++ b/python_apps/media-monitor/install/media-monitor-uninitialize.py @@ -9,7 +9,7 @@ if os.geteuid() != 0: try: print "Waiting for media-monitor processes to stop...", if (os.path.exists('/etc/init.d/airtime-media-monitor')): - p = Popen("/etc/init.d/airtime-media-monitor stop", shell=True) + p = Popen("invoke-rc.d airtime-media-monitor stop", shell=True) sts = os.waitpid(p.pid, 0)[1] print "OK" else: diff --git a/python_apps/media-monitor/install/media-monitor-uninstall.py b/python_apps/media-monitor/install/media-monitor-uninstall.py index ed6fa4195..d2a201316 100644 --- a/python_apps/media-monitor/install/media-monitor-uninstall.py +++ b/python_apps/media-monitor/install/media-monitor-uninstall.py @@ -29,7 +29,7 @@ try: print 'Error loading config file: ', e sys.exit(1) - os.system("/etc/init.d/airtime-media-monitor stop") + os.system("invoke-rc.d airtime-media-monitor stop") os.system("rm -f /etc/init.d/airtime-media-monitor") os.system("update-rc.d -f airtime-media-monitor remove >/dev/null 2>&1") diff --git a/python_apps/pypo/install/pypo-initialize.py b/python_apps/pypo/install/pypo-initialize.py index acf3cf50d..3273b5da3 100644 --- a/python_apps/pypo/install/pypo-initialize.py +++ b/python_apps/pypo/install/pypo-initialize.py @@ -117,17 +117,8 @@ try: #restart airtime-playout print "* Waiting for pypo processes to start..." - """ - if os.environ["liquidsoap_keep_alive"] == "f": - print " * Restarting any previous Liquidsoap instances" - p = Popen("/etc/init.d/airtime-playout stop > /dev/null 2>&1", shell=True) - sts = os.waitpid(p.pid, 0)[1] - else: - print " * Keeping any previous Liquidsoap instances running" - p = Popen("/etc/init.d/airtime-playout pypo-stop > /dev/null 2>&1", shell=True) - sts = os.waitpid(p.pid, 0)[1] - """ - p = Popen("/etc/init.d/airtime-playout start-no-monit > /dev/null 2>&1", shell=True) + + p = Popen("invoke-rc.d airtime-playout start-no-monit > /dev/null 2>&1", shell=True) sts = os.waitpid(p.pid, 0)[1] except Exception, e: diff --git a/python_apps/pypo/install/pypo-uninitialize.py b/python_apps/pypo/install/pypo-uninitialize.py index 864d94a3d..2329e88e7 100644 --- a/python_apps/pypo/install/pypo-uninitialize.py +++ b/python_apps/pypo/install/pypo-uninitialize.py @@ -10,7 +10,7 @@ try: #stop pypo and liquidsoap processes print "Waiting for pypo processes to stop...", if (os.path.exists('/etc/init.d/airtime-playout')): - p = Popen("/etc/init.d/airtime-playout stop", shell=True) + p = Popen("invoke-rc.d airtime-playout stop", shell=True) sts = os.waitpid(p.pid, 0)[1] print "OK" else: diff --git a/python_apps/pypo/install/pypo-uninstall.py b/python_apps/pypo/install/pypo-uninstall.py index 9b4429598..f3306d9c7 100644 --- a/python_apps/pypo/install/pypo-uninstall.py +++ b/python_apps/pypo/install/pypo-uninstall.py @@ -30,7 +30,7 @@ try: print 'Error loading config file: ', e sys.exit(1) - os.system("/etc/init.d/airtime-playout stop") + os.system("invoke-rc.d airtime-playout stop") os.system("rm -f /etc/init.d/airtime-playout") os.system("update-rc.d -f airtime-playout remove >/dev/null 2>&1")