Преглед на файлове

Change the event subscription names so listeners can use "startswith" to quickly determine the major event type.

Chris McDonough преди 18 години
родител
ревизия
0100f4c688
променени са 2 файла, в които са добавени 17 реда и са изтрити 16 реда
  1. 15 15
      src/supervisor/events.py
  2. 2 1
      src/supervisor/tests/test_process.py

+ 15 - 15
src/supervisor/events.py

@@ -156,25 +156,25 @@ class EventRejectedEvent:
 class EventTypes:
     EVENT = Event
     PROCESS_STATE_CHANGE = ProcessStateChangeEvent
-    STARTING_FROM_STOPPED = StartingFromStoppedEvent
-    STARTING_FROM_BACKOFF = StartingFromBackoffEvent
-    STARTING_FROM_EXITED = StartingFromExitedEvent
-    STARTING_FROM_FATAL = StartingFromFatalEvent
-    RUNNING = RunningFromStartingEvent
-    BACKOFF = BackoffFromStartingEvent
-    STOPPING_FROM_RUNNING = StoppingFromRunningEvent
-    STOPPING_FROM_STARTING = StoppingFromStartingEvent
-    EXITED_OR_STOPPED = ExitedOrStoppedEvent
-    EXITED = ExitedFromRunningEvent
-    STOPPED = StoppedFromStoppingEvent
-    FATAL = FatalFromBackoffEvent
-    UNKNOWN = ToUnknownEvent
+    PROCESS_STATE_CHANGE_STARTING_FROM_STOPPED = StartingFromStoppedEvent
+    PROCESS_STATE_CHANGE_STARTING_FROM_BACKOFF = StartingFromBackoffEvent
+    PROCESS_STATE_CHANGE_STARTING_FROM_EXITED = StartingFromExitedEvent
+    PROCESS_STATE_CHANGE_STARTING_FROM_FATAL = StartingFromFatalEvent
+    PROCESS_STATE_CHANGE_RUNNING_FROM_STARTING = RunningFromStartingEvent
+    PROCESS_STATE_CHANGE_BACKOFF_FROM_STARTING = BackoffFromStartingEvent
+    PROCESS_STATE_CHANGE_STOPPING_FROM_RUNNING = StoppingFromRunningEvent
+    PROCESS_STATE_CHANGE_STOPPING_FROM_STARTING = StoppingFromStartingEvent
+    PROCESS_STATE_CHANGE_EXITED_OR_STOPPED = ExitedOrStoppedEvent
+    PROCESS_STATE_CHANGE_EXITED_FROM_RUNNING = ExitedFromRunningEvent
+    PROCESS_STATE_CHANGE_STOPPED_FROM_STOPPING = StoppedFromStoppingEvent
+    PROCESS_STATE_CHANGE_FATAL_FROM_BACKOFF = FatalFromBackoffEvent
+    PROCESS_STATE_CHANGE_TO_UNKNOWN = ToUnknownEvent
     PROCESS_COMMUNICATION = ProcessCommunicationEvent
     PROCESS_COMMUNICATION_STDOUT = ProcessCommunicationStdoutEvent
     PROCESS_COMMUNICATION_STDERR = ProcessCommunicationStderrEvent
     SUPERVISOR_STATE_CHANGE = SupervisorStateChangeEvent
-    SUPERVISOR_RUNNING = SupervisorRunningEvent
-    SUPERVISOR_STOPPING = SupervisorStoppingEvent
+    SUPERVISOR_STATE_CHANGE_RUNNING = SupervisorRunningEvent
+    SUPERVISOR_STATE_CHANGE_STOPPING = SupervisorStoppingEvent
     EVENT_BUFFER_OVERFLOW = EventBufferOverflowEvent
 
 def getEventNameByType(requested):

+ 2 - 1
src/supervisor/tests/test_process.py

@@ -1143,7 +1143,8 @@ class EventListenerPoolTests(ProcessGroupBaseTests):
         self.assertEqual(process1.transitioned, True)
         self.assertEqual(pool.event_buffer, [])
         buf = process1.stdin_buffer
-        self.assertTrue(buf.startswith('SUPERVISORD3.0 STARTING_FROM_STOPPED '))
+        self.assertTrue(buf.startswith(
+            'SUPERVISORD3.0 PROCESS_STATE_CHANGE_STARTING_FROM_STOPPED '))
         self.assertTrue(buf.endswith(
             '43\nprocess_name: process1\ngroup_name: whatever'), buf)
         self.assertEqual(process1.listener_state, EventListenerStates.BUSY)