afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

daemon: Minor code reorganization.

Browse source
This commit is contained in:
Tom Goff 2016-03-04 16:57:46 -05:00
parent 6f77086540
commit d681534b17
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
daemon/core/emane/emane.py
View file

@ -122,10 +122,6 @@ class Emane(ConfigurableManager):
try: try:
self.service = EventService(eventchannel=eventchannel, self.service = EventService(eventchannel=eventchannel,
otachannel=None) otachannel=None)
for f in self.service._socket, self.service._readFd, \
self.service._writeFd, self.service._socketOTA:
if f:
closeonexec(f)
except Exception, e: except Exception, e:
msg = "Error instantiating EMANE event service: %s" % e msg = "Error instantiating EMANE event service: %s" % e
self.session.exception(coreapi.CORE_EXCP_LEVEL_ERROR, self.session.exception(coreapi.CORE_EXCP_LEVEL_ERROR,
@ -140,6 +136,11 @@ class Emane(ConfigurableManager):
except: except:
self.service = None self.service = None
rc = False rc = False
if self.service:
for f in self.service._readFd, self.service._writeFd, \
self.service._socket, self.service._socketOTA:
if f:
closeonexec(f)
if filename is not None: if filename is not None:
os.environ.pop(self.EVENTCFGVAR) os.environ.pop(self.EVENTCFGVAR)
if tmp is not None: if tmp is not None: