diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-07-22 07:24:07 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2016-07-24 09:36:48 -0400 |
| commit | 81dd3f79b74816e628145b6b1ea670462534f955 (patch) | |
| tree | baabf1b5484e68e11bb0bff54835fbcd183a46bf /pysystemmgr | |
| parent | 416539dfa13a31738ba7ec9fef6fd3ddc19ef815 (diff) | |
| download | talos-skeleton-81dd3f79b74816e628145b6b1ea670462534f955.tar.gz talos-skeleton-81dd3f79b74816e628145b6b1ea670462534f955.zip | |
system_manager: Remove dead code
Remove a reference to 'BMC_INIT' state which isn't used.
Remove heartbeat code that isn't used.
Change-Id: I2de0c881372085519a15235703881054c5a9adfa
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'pysystemmgr')
| -rw-r--r-- | pysystemmgr/system_manager.py | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/pysystemmgr/system_manager.py b/pysystemmgr/system_manager.py index 6969485..72fa59c 100644 --- a/pysystemmgr/system_manager.py +++ b/pysystemmgr/system_manager.py @@ -7,7 +7,6 @@ import dbus import dbus.service import dbus.mainloop.glib import os -import time import obmc.dbuslib.propertycacher as PropertyCacher from obmc.dbuslib.bindings import DbusProperties, DbusObjectManager, get_dbus import obmc.enums @@ -17,8 +16,6 @@ import obmc.utils.misc DBUS_NAME = 'org.openbmc.managers.System' OBJ_NAME = '/org/openbmc/managers/System' -HEARTBEAT_CHECK_INTERVAL = 20000 -STATE_START_TIMEOUT = 10 INTF_SENSOR = 'org.openbmc.SensorValue' INTF_ITEM = 'org.openbmc.InventoryItem' INTF_CONTROL = 'org.openbmc.Control' @@ -95,10 +92,6 @@ class SystemManager(DbusProperties, DbusObjectManager): for name in self.system_states[state_name]: self.start_process(name) - if (state_name == "BMC_INIT"): - ## Add poll for heartbeat - gobject.timeout_add(HEARTBEAT_CHECK_INTERVAL, self.heartbeat_check) - try: cb = System.ENTER_STATE_CALLBACK[state_name] for methd in cb.keys(): @@ -192,19 +185,6 @@ class SystemManager(DbusProperties, DbusObjectManager): ## TODO: error print "ERROR: starting process: "+" ".join(cmdline) - def heartbeat_check(self): - for name in System.APPS.keys(): - app = System.APPS[name] - if app['start_process'] and 'popen' in app: - ## make sure process is still alive - p = app['popen'] - p.poll() - if p.returncode is None: - print "Process for "+name+" appears to be dead" - self.start_process(name) - - return True - def bus_handler(self, owned_name, old, new): if obmc.dbuslib.bindings.is_unique(owned_name) or not new: return |
