summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/server
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/server')
-rw-r--r--bitbake/lib/bb/server/process.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py
index f4ab80ba67..44c65451fc 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -154,9 +154,10 @@ class ProcessServer():
154 fds.append(self.xmlrpc) 154 fds.append(self.xmlrpc)
155 seendata = False 155 seendata = False
156 serverlog("Entering server connection loop") 156 serverlog("Entering server connection loop")
157 serverlog("Lockfile is: %s\nSocket is %s (%s)" % (self.bitbake_lock_name, self.sockname, os.path.exists(self.sockname)))
157 158
158 def disconnect_client(self, fds): 159 def disconnect_client(self, fds):
159 serverlog("Disconnecting Client") 160 serverlog("Disconnecting Client (socket: %s)" % os.path.exists(self.sockname))
160 if self.controllersock: 161 if self.controllersock:
161 fds.remove(self.controllersock) 162 fds.remove(self.controllersock)
162 self.controllersock.close() 163 self.controllersock.close()
@@ -246,7 +247,7 @@ class ProcessServer():
246 try: 247 try:
247 serverlog("Running command %s" % command) 248 serverlog("Running command %s" % command)
248 self.command_channel_reply.send(self.cooker.command.runCommand(command)) 249 self.command_channel_reply.send(self.cooker.command.runCommand(command))
249 serverlog("Command Completed") 250 serverlog("Command Completed (socket: %s)" % os.path.exists(self.sockname))
250 except Exception as e: 251 except Exception as e:
251 stack = traceback.format_exc() 252 stack = traceback.format_exc()
252 serverlog('Exception in server main event loop running command %s (%s)' % (command, stack)) 253 serverlog('Exception in server main event loop running command %s (%s)' % (command, stack))
@@ -273,7 +274,7 @@ class ProcessServer():
273 274
274 ready = self.idle_commands(.1, fds) 275 ready = self.idle_commands(.1, fds)
275 276
276 serverlog("Exiting") 277 serverlog("Exiting (socket: %s)" % os.path.exists(self.sockname))
277 # Remove the socket file so we don't get any more connections to avoid races 278 # Remove the socket file so we don't get any more connections to avoid races
278 try: 279 try:
279 os.unlink(self.sockname) 280 os.unlink(self.sockname)