diff options
| author | jmbills <jason.m.bills@intel.com> | 2021-08-03 01:45:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-03 01:45:08 +0300 |
| commit | 10ad77d5bc86709d8ff7f95e7040e39f1c153903 (patch) | |
| tree | 307cedb87f4c0a329740c55ac364ed489d1d8fc2 /poky/bitbake/lib/bb/server/process.py | |
| parent | c6b1c6ba7a01b7987d65d61c262c44c320193108 (diff) | |
| parent | 67327ddc580cb9a85219a534844832a1682780d4 (diff) | |
| download | openbmc-10ad77d5bc86709d8ff7f95e7040e39f1c153903.tar.xz | |
Update
Diffstat (limited to 'poky/bitbake/lib/bb/server/process.py')
| -rw-r--r-- | poky/bitbake/lib/bb/server/process.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/poky/bitbake/lib/bb/server/process.py b/poky/bitbake/lib/bb/server/process.py index b27b4aefe..155e8d131 100644 --- a/poky/bitbake/lib/bb/server/process.py +++ b/poky/bitbake/lib/bb/server/process.py @@ -367,7 +367,12 @@ class ProcessServer(): self.next_heartbeat = now + self.heartbeat_seconds if hasattr(self.cooker, "data"): heartbeat = bb.event.HeartbeatEvent(now) - bb.event.fire(heartbeat, self.cooker.data) + try: + bb.event.fire(heartbeat, self.cooker.data) + except Exception as exc: + if not isinstance(exc, bb.BBHandledException): + logger.exception('Running heartbeat function') + self.quit = True if nextsleep and now + nextsleep > self.next_heartbeat: # Shorten timeout so that we we wake up in time for # the heartbeat. @@ -509,7 +514,7 @@ class BitBakeServer(object): os.set_inheritable(self.bitbake_lock.fileno(), True) os.set_inheritable(self.readypipein, True) serverscript = os.path.realpath(os.path.dirname(__file__) + "/../../../bin/bitbake-server") - os.execl(sys.executable, "bitbake-server", serverscript, "decafbad", str(self.bitbake_lock.fileno()), str(self.readypipein), self.logfile, self.bitbake_lock.name, self.sockname, str(self.server_timeout), str(self.xmlrpcinterface[0]), str(self.xmlrpcinterface[1])) + os.execl(sys.executable, "bitbake-server", serverscript, "decafbad", str(self.bitbake_lock.fileno()), str(self.readypipein), self.logfile, self.bitbake_lock.name, self.sockname, str(self.server_timeout or 0), str(self.xmlrpcinterface[0]), str(self.xmlrpcinterface[1])) def execServer(lockfd, readypipeinfd, lockname, sockname, server_timeout, xmlrpcinterface): |