Robert Brewer avatar Robert Brewer committed e5596a8

Changed bus event messages to match the state enum values.

Comments (0)

Files changed (1)

cherrypy/restsrv/wspbus.py

                 # If we have previous errors ensure the exit code is non-zero
                 if exc and e.code == 0:
                     e.code = 1
-                raise 
+                raise
             except:
                 self.log("Error in %r listener %r" % (channel, listener),
                          traceback=True)
     def start(self):
         """Start all services."""
         self.state = states.STARTING
-        self.log('Bus starting')
+        self.log('Bus STARTING')
         try:
             self.publish('start')
+            self.state = states.STARTED
+            self.log('Bus STARTED')
         except (KeyboardInterrupt, SystemExit):
             raise
         except:
                 pass
             self.log("Exception that caused shutdown: %s" % start_trace)
             raise e_info[0], e_info[1], e_info[2]
-
-        self.state = states.STARTED
     
     def exit(self, status=0):
         """Stop all services and exit the process."""
     def stop(self):
         """Stop all services."""
         self.state = states.STOPPING
-        self.log('Bus stopping')
+        self.log('Bus STOPPING')
         self.publish('stop')
         self.state = states.STOPPED
+        self.log('Bus STOPPED')
     
     def start_with_callback(self, func, args=None, kwargs=None):
         """Start 'func' in a new thread T, then start self (and return T)."""
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.