]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Fixes 'ovs-agent fails to start on Windows beacause of SIGHUP'
authorAdelina Tuvenie <atuvenie@cloudbasesolutions.com>
Thu, 24 Sep 2015 13:17:06 +0000 (06:17 -0700)
committerAdelina Tuvenie <atuvenie@cloudbasesolutions.com>
Thu, 24 Sep 2015 14:22:15 +0000 (07:22 -0700)
Change Ic0cf8a9ca7f3a16b556a6825e2979471ae136c33 has added the handling
of SIGHUP in neutron_ovs_agent. This does not work on Windows as there is
no SIGHUP signal on windows.

The fix consists in checking if signal has SIGHUP attr before setting the handler
for SIGHUP.

Change-Id: I08258580252d68db222cbb9db7812ff1dfb37a56
Closes-Bug: #1499345

neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py

index ee54f3e01cbe4c28dcbb24de6520a2f75bca45d8..022b5d38c59e9d7a472aaac7a8200eb63a05e88a 100644 (file)
@@ -1784,7 +1784,8 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
         # Start everything.
         LOG.info(_LI("Agent initialized successfully, now running... "))
         signal.signal(signal.SIGTERM, self._handle_sigterm)
-        signal.signal(signal.SIGHUP, self._handle_sighup)
+        if hasattr(signal, 'SIGHUP'):
+            signal.signal(signal.SIGHUP, self._handle_sighup)
         with polling.get_polling_manager(
             self.minimize_polling,
             self.ovsdb_monitor_respawn_interval) as pm: