From e450b10c4ca4a8c32bbe2f77872f84993426fef4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 30 Oct 2012 17:20:55 +0000 Subject: [PATCH] bitbake: bitbake/server: Remove dead console log code This code is dead and doesn't do anything so lets remove it. (Bitbake rev: 8d45739f49618757a5d7d79782deda355e3981ec) Signed-off-by: Richard Purdie --- bitbake/bin/bitbake | 6 +----- bitbake/lib/bb/server/none.py | 4 ++-- bitbake/lib/bb/server/process.py | 2 +- bitbake/lib/bb/server/xmlrpc.py | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index cb5d84adbe..70099e4292 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/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/bitbake/lib/bb/server/none.py b/bitbake/lib/bb/server/none.py index 3be7b1daf6..f5fd4d4f7b 100644 --- a/bitbake/lib/bb/server/none.py +++ b/bitbake/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/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py index ba9133639d..4eefe01852 100644 --- a/bitbake/lib/bb/server/process.py +++ b/bitbake/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/bitbake/lib/bb/server/xmlrpc.py b/bitbake/lib/bb/server/xmlrpc.py index eff80098a2..66f21a008b 100644 --- a/bitbake/lib/bb/server/xmlrpc.py +++ b/bitbake/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