Browse Source

Replace _getSignalFromString with supervisor.datatypes.signal_number

Marc Abramowitz 10 năm trước cách đây
mục cha
commit
315b30e3fe
1 tập tin đã thay đổi với 1 bổ sung15 xóa
  1. 1 15
      supervisor/rpcinterface.py

+ 1 - 15
supervisor/rpcinterface.py

@@ -466,20 +466,6 @@ class SupervisorNamespaceRPCInterface:
         return killall # deferred
 
 
-    def _getSignalFromString(self, name):
-        try:
-            return int(name)
-        except ValueError:
-            pass
-        name = name.upper()
-        sig = getattr(signal, name, None)
-        if isinstance(sig, int):
-            return sig
-        sig = getattr(signal, "SIG%s" % name, None)
-        if isinstance(sig, int):
-            return sig
-
-
     def sendProcessSignal(self, name, signal='HUP'):
         """ Send an arbitrary UNIX signal to the process named by name
 
@@ -496,7 +482,7 @@ class SupervisorNamespaceRPCInterface:
             group_name, process_name = split_namespec(name)
             return self.sendGroupSignal(group_name, signal=signal)
 
-        sig = self._getSignalFromString(signal)
+        sig = supervisor.datatypes.signal_number(signal)
 
         if process.get_state() not in RUNNING_STATES:
            raise RPCError(Faults.NOT_RUNNING)