diff options
| -rwxr-xr-x | bin/bitbake | 6 | ||||
| -rw-r--r-- | lib/bb/server/none.py | 4 | ||||
| -rw-r--r-- | lib/bb/server/process.py | 2 | ||||
| -rw-r--r-- | lib/bb/server/xmlrpc.py | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/bin/bitbake b/bin/bitbake index cb5d84adb..70099e429 100755 --- a/bin/bitbake +++ b/bin/bitbake @@ -214,10 +214,6 @@ Default BBFILES are the .bb files in the current directory.""") if configuration.bind and configuration.servertype != "xmlrpc": sys.exit("FATAL: If '-B' or '--bind' is defined, we must set the servertype as 'xmlrpc'.\n") - # Save a logfile for cooker into the current working directory. When the - # server is daemonized this logfile will be truncated. - cooker_logfile = os.path.join(os.getcwd(), "cooker.log") - bb.msg.init_msgconfig(configuration.verbose, configuration.debug, configuration.debug_domains) @@ -246,7 +242,7 @@ Default BBFILES are the .bb files in the current directory.""") server.addcooker(cooker) server.saveConnectionDetails() - server.detach(cooker_logfile) + server.detach() # Should no longer need to ever reference cooker del cooker diff --git a/lib/bb/server/none.py b/lib/bb/server/none.py index 3be7b1daf..f5fd4d4f7 100644 --- a/lib/bb/server/none.py +++ b/lib/bb/server/none.py @@ -191,8 +191,8 @@ class BitBakeServer(object): def saveConnectionDetails(self): return - def detach(self, cooker_logfile): - self.logfile = cooker_logfile + def detach(self): + return def establishConnection(self): self.connection = BitBakeServerConnection(self) diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py index ba9133639..4eefe0185 100644 --- a/lib/bb/server/process.py +++ b/lib/bb/server/process.py @@ -256,7 +256,7 @@ class BitBakeServer(object): def saveConnectionDetails(self): return - def detach(self, cooker_logfile): + def detach(self): self.server.start() return diff --git a/lib/bb/server/xmlrpc.py b/lib/bb/server/xmlrpc.py index eff80098a..66f21a008 100644 --- a/lib/bb/server/xmlrpc.py +++ b/lib/bb/server/xmlrpc.py @@ -280,8 +280,8 @@ class BitBakeServer(object): def saveConnectionDetails(self): self.serverinfo = BitbakeServerInfo(self.server.host, self.server.port) - def detach(self, cooker_logfile): - daemonize.createDaemon(self.server.serve_forever, cooker_logfile) + def detach(self): + daemonize.createDaemon(self.server.serve_forever) del self.cooker del self.server |