From 24a06f011a425ebf9c3f2051238c7c5e73541477 Mon Sep 17 00:00:00 2001 From: Philip Joseph Date: Wed, 5 Apr 2017 21:31:12 +0530 Subject: [PATCH 1/1] Bug 234 : Add timeout to commands for pingpong Signed-off-by: Philip Joseph --- layers/pingpong/reactive/pingpong.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/layers/pingpong/reactive/pingpong.py b/layers/pingpong/reactive/pingpong.py index 05debf45..b5a5db96 100644 --- a/layers/pingpong/reactive/pingpong.py +++ b/layers/pingpong/reactive/pingpong.py @@ -55,7 +55,7 @@ def start(): try: # Bring up the eth1 interface. # The selinux label on the file needs to be set correctly - cmd = "sudo /sbin/restorecon -v /etc/sysconfig/network-scripts/ifcfg-eth1" + cmd = "sudo timeout 5 /sbin/restorecon -v /etc/sysconfig/network-scripts/ifcfg-eth1" result, err = charms.sshproxy._run(cmd) except Exception as e: err = "{}".format(e) @@ -64,7 +64,7 @@ def start(): return try: - cmd = "sudo /sbin/ifup eth1" + cmd = "sudo timeout 30 /sbin/ifup eth1" result, err = charms.sshproxy._run(cmd) except Exception as e: action_fail('command failed: {}, errors: {}'.format(e, e.output)) @@ -72,7 +72,7 @@ def start(): return try: - cmd = "sudo /usr/bin/systemctl start {}". \ + cmd = "sudo timeout 30 /usr/bin/systemctl start {}". \ format(cfg['mode']) result, err = charms.sshproxy._run(cmd) except Exception as e: @@ -89,7 +89,7 @@ def start(): def stop(): try: # Enter the command to stop your service(s) - cmd = "sudo /usr/bin/systemctl stop {}".format(cfg['mode']) + cmd = "sudo timeout 30 /usr/bin/systemctl stop {}".format(cfg['mode']) result, err = charms.sshproxy._run(cmd) except Exception as e: action_fail('command failed: {}, errors: {}'.format(e, e.output)) @@ -105,7 +105,7 @@ def stop(): def restart(): try: # Enter the command to restart your service(s) - cmd = "sudo /usr/bin/systemctl restart {}".format(cfg['mode']) + cmd = "sudo timeout 30 /usr/bin/systemctl restart {}".format(cfg['mode']) result, err = charms.sshproxy._run(cmd) except Exception as e: action_fail('command failed: {}, errors: {}'.format(e, e.output)) -- 2.25.1