[tuxdroid-svn] r4684 - software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers
Status: Beta
Brought to you by:
ks156
|
From: remi <c2m...@c2...> - 2009-05-27 08:34:01
|
Author: remi
Date: 2009-05-27 10:33:42 +0200 (Wed, 27 May 2009)
New Revision: 4684
Modified:
software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/00_resourceAttituneManager.py
software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/01_resourcePluginsServer.py
Log:
* removed useless events
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/00_resourceAttituneManager.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/00_resourceAttituneManager.py 2009-05-27 08:29:03 UTC (rev 4683)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/00_resourceAttituneManager.py 2009-05-27 08:33:42 UTC (rev 4684)
@@ -7,7 +7,6 @@
from util.logger.SimpleLogger import *
# Attitune manager events/statuses
-ST_NAME_AM_RUN = "attitune_manager_run"
ST_NAME_AM_CONTAINER_DEPLOYED = "attitune_manager_container_deployed"
ST_NAME_AM_CONTAINER_ERROR = "attitune_manager_container_error"
ST_NAME_AM_ATTITUNE_LOADED = "attitune_manager_attitune_loaded"
@@ -17,7 +16,6 @@
# Attitune manager events/statuses list
SW_NAME_ATTITUNE_MANAGER = [
- ST_NAME_AM_RUN, # Is sent to clients
ST_NAME_AM_CONTAINER_DEPLOYED, # Is sent to clients
ST_NAME_AM_CONTAINER_ERROR, # Is not sent to clients
ST_NAME_AM_ATTITUNE_LOADED, # Is not sent to clients
@@ -52,7 +50,6 @@
# Registering the attitune manager statuses.
for statusName in SW_NAME_ATTITUNE_MANAGER:
eventsHandler.insert(statusName)
- eventsHandler.getEventHandler(ST_NAME_AM_RUN).updateState("False")
# Create a logger
self.logger = SimpleLogger("attitune_manager")
self.logger.resetLog()
@@ -66,7 +63,6 @@
def stop(self):
self.logger.logInfo("Undeploy the attitunes container")
self.__attitunesContainer.undeploy()
- self.__publishEvents(True, ST_NAME_AM_RUN, ["False",])
# --------------------------------------------------------------------------
# Attitunes container events
@@ -299,7 +295,6 @@
else:
# Start the attitune manager
attitunesContainer = resourceAttituneManager.getAttitunesContainer()
- resourceAttituneManager.publishEvents(True, ST_NAME_AM_RUN, ["False",])
resourceAttituneManager.logger.logInfo("Undeploy the attitunes container.")
attitunesContainer.undeploy()
resourceAttituneManager.logger.logInfo("Attitunes container is undeployed.")
@@ -313,7 +308,6 @@
resourceAttituneManager.logger.logInfo("Deploy the attitunes container.")
attitunesContainer.deploy()
resourceAttituneManager.logger.logInfo("Attitunes container is deployed.")
- resourceAttituneManager.publishEvents(True, ST_NAME_AM_RUN, ["True",])
return headersStruct, contentStruct
# Register the service into the resource
Modified: software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/01_resourcePluginsServer.py
===================================================================
--- software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/01_resourcePluginsServer.py 2009-05-27 08:29:03 UTC (rev 4683)
+++ software_suite_v3/smart-core/smart-server/trunk/resources/03_content_servers/01_resourcePluginsServer.py 2009-05-27 08:33:42 UTC (rev 4684)
@@ -8,20 +8,18 @@
from util.misc.tuxPaths import TUXDROID_DEFAULT_LOCUTOR
from util.logger.SimpleLogger import *
-# Framework events/statuses
-ST_NAME_PS_RUN = "plugins_server_run"
+# Plugins server events/statuses
ST_NAME_PS_CONTAINER_DEPLOYED = "plugins_server_container_deployed"
ST_NAME_PS_CONTAINER_ERROR = "plugins_server_container_error"
ST_NAME_PS_PLUGIN_LOADED = "plugins_server_plugin_loaded"
ST_NAME_PS_PLUGIN_UNLOADED = "plugins_server_plugin_unloaded"
-# Framework events/statuses list
+# Plugins server events/statuses list
SW_NAME_PLUGINS_SERVER = [
- ST_NAME_PS_RUN, # Is sent to clients
- ST_NAME_PS_CONTAINER_DEPLOYED, # Is sent to clients
- ST_NAME_PS_CONTAINER_ERROR, # Is not sent to clients
- ST_NAME_PS_PLUGIN_LOADED, # Is not sent to clients
- ST_NAME_PS_PLUGIN_UNLOADED, # Is not sent to clients
+ ST_NAME_PS_CONTAINER_DEPLOYED,
+ ST_NAME_PS_CONTAINER_ERROR,
+ ST_NAME_PS_PLUGIN_LOADED,
+ ST_NAME_PS_PLUGIN_UNLOADED,
]
# ------------------------------------------------------------------------------
@@ -47,7 +45,6 @@
# Registering the plugins server statuses.
for statusName in SW_NAME_PLUGINS_SERVER:
eventsHandler.insert(statusName)
- eventsHandler.getEventHandler(ST_NAME_PS_RUN).updateState("False")
# Create a logger
self.logger = SimpleLogger("plugins_server")
self.logger.resetLog()
@@ -77,12 +74,10 @@
self.logger.logInfo("Deploy the plugins container.")
self.__pluginsContainer.deploy()
self.logger.logInfo("Plugins container is deployed.")
- self.__publishEvents(True, ST_NAME_PS_RUN, ["True",])
def stop(self):
self.logger.logInfo("Undeploy the plugins container")
self.__PluginsContainer.undeploy()
- self.__publishEvents(True, ST_NAME_PS_RUN, ["False",])
# --------------------------------------------------------------------------
# Plugins container events
|