diff options
| -rwxr-xr-x | bitbake/bin/bitbake | 6 | ||||
| -rw-r--r-- | bitbake/lib/bb/server/none.py | 4 | ||||
| -rw-r--r-- | bitbake/lib/bb/server/process.py | 2 | ||||
| -rw-r--r-- | 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.""") | |||
| 214 | if configuration.bind and configuration.servertype != "xmlrpc": | 214 | if configuration.bind and configuration.servertype != "xmlrpc": | 
| 215 | sys.exit("FATAL: If '-B' or '--bind' is defined, we must set the servertype as 'xmlrpc'.\n") | 215 | sys.exit("FATAL: If '-B' or '--bind' is defined, we must set the servertype as 'xmlrpc'.\n") | 
| 216 | 216 | ||
| 217 | # Save a logfile for cooker into the current working directory. When the | ||
| 218 | # server is daemonized this logfile will be truncated. | ||
| 219 | cooker_logfile = os.path.join(os.getcwd(), "cooker.log") | ||
| 220 | |||
| 221 | bb.msg.init_msgconfig(configuration.verbose, configuration.debug, | 217 | bb.msg.init_msgconfig(configuration.verbose, configuration.debug, | 
| 222 | configuration.debug_domains) | 218 | configuration.debug_domains) | 
| 223 | 219 | ||
| @@ -246,7 +242,7 @@ Default BBFILES are the .bb files in the current directory.""") | |||
| 246 | 242 | ||
| 247 | server.addcooker(cooker) | 243 | server.addcooker(cooker) | 
| 248 | server.saveConnectionDetails() | 244 | server.saveConnectionDetails() | 
| 249 | server.detach(cooker_logfile) | 245 | server.detach() | 
| 250 | 246 | ||
| 251 | # Should no longer need to ever reference cooker | 247 | # Should no longer need to ever reference cooker | 
| 252 | del cooker | 248 | 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): | |||
| 191 | def saveConnectionDetails(self): | 191 | def saveConnectionDetails(self): | 
| 192 | return | 192 | return | 
| 193 | 193 | ||
| 194 | def detach(self, cooker_logfile): | 194 | def detach(self): | 
| 195 | self.logfile = cooker_logfile | 195 | return | 
| 196 | 196 | ||
| 197 | def establishConnection(self): | 197 | def establishConnection(self): | 
| 198 | self.connection = BitBakeServerConnection(self) | 198 | 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): | |||
| 256 | def saveConnectionDetails(self): | 256 | def saveConnectionDetails(self): | 
| 257 | return | 257 | return | 
| 258 | 258 | ||
| 259 | def detach(self, cooker_logfile): | 259 | def detach(self): | 
| 260 | self.server.start() | 260 | self.server.start() | 
| 261 | return | 261 | return | 
| 262 | 262 | ||
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): | |||
| 280 | def saveConnectionDetails(self): | 280 | def saveConnectionDetails(self): | 
| 281 | self.serverinfo = BitbakeServerInfo(self.server.host, self.server.port) | 281 | self.serverinfo = BitbakeServerInfo(self.server.host, self.server.port) | 
| 282 | 282 | ||
| 283 | def detach(self, cooker_logfile): | 283 | def detach(self): | 
| 284 | daemonize.createDaemon(self.server.serve_forever, cooker_logfile) | 284 | daemonize.createDaemon(self.server.serve_forever) | 
| 285 | del self.cooker | 285 | del self.cooker | 
| 286 | del self.server | 286 | del self.server | 
| 287 | 287 | ||
