diff options
| author | Colin Walters <walters@verbum.org> | 2010-03-01 02:41:25 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-03-01 02:41:25 -0500 |
| commit | a6d166dcc7c8a28a78a89a6ae4d8120955278891 (patch) | |
| tree | 588d226340ae08293a4a8e5aa5911666b1448198 | |
| parent | 2d732a082eb730ce7153a09dbb705518f39274d7 (diff) | |
| download | fedpkg-make-pull-a6d166dcc7c8a28a78a89a6ae4d8120955278891.tar.gz fedpkg-make-pull-a6d166dcc7c8a28a78a89a6ae4d8120955278891.tar.xz fedpkg-make-pull-a6d166dcc7c8a28a78a89a6ae4d8120955278891.zip | |
[qabox] Add build state to status
| -rwxr-xr-x | qabox/fedpkg-autobuilder | 14 | ||||
| -rw-r--r-- | qabox/supybot/Fedpkg/plugin.py | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/qabox/fedpkg-autobuilder b/qabox/fedpkg-autobuilder index fe663ab..37689d4 100755 --- a/qabox/fedpkg-autobuilder +++ b/qabox/fedpkg-autobuilder @@ -65,6 +65,7 @@ class Autobuilder(dbus.service.Object): self._pullbuild_proxy = None self._status = STATUS_IDLE + self._statusdata = {} self._state = STATE_BURNING self._statedata = {} @@ -76,8 +77,8 @@ class Autobuilder(dbus.service.Object): pass @dbus.service.signal(dbus_interface='org.fedoraproject.FedpkgAutoBuilder', - signature='s') - def StatusChanged(self, status): + signature='sa{sv}') + def StatusChanged(self, status, statusdata): pass @dbus.service.method(dbus_interface='org.fedoraproject.FedpkgAutoBuilder', @@ -86,9 +87,9 @@ class Autobuilder(dbus.service.Object): return (self._state, self._statedata) @dbus.service.method(dbus_interface='org.fedoraproject.FedpkgAutoBuilder', - in_signature='', out_signature='s') + in_signature='', out_signature='sa{sv}') def GetStatus(self): - return self._status + return (self._status, self._statusdata) @dbus.service.method(dbus_interface='org.fedoraproject.FedpkgAutoBuilder', in_signature='', out_signature='as') @@ -148,12 +149,15 @@ class Autobuilder(dbus.service.Object): def __on_builder_state_changed(self, state, statedata): logging.info("builder state=%s statedata=%r" % (state, statedata)) + self._statusdata = dict(statedata) + self.StatusChanged(self._status, self._statusdata) def __on_builder_exited(self, pid, condition): logging.info("builder pid=%d exited, condition=%r", pid, condition) self._pullbuild_pid = None self._status = STATUS_IDLE - self.StatusChanged(self._status) + self._statusdata = {} + self.StatusChanged(self._status, self._statusdata) def main(): try: diff --git a/qabox/supybot/Fedpkg/plugin.py b/qabox/supybot/Fedpkg/plugin.py index fdc7343..ec7bbaa 100644 --- a/qabox/supybot/Fedpkg/plugin.py +++ b/qabox/supybot/Fedpkg/plugin.py @@ -56,9 +56,9 @@ class Fedpkg(callbacks.Plugin): if self._autobuild_proxy is None: irc.reply(AUTOBUILD_SERVICE + ' is not running') return - status = self._autobuild_proxy.GetStatus() + (status, statusdata) = self._autobuild_proxy.GetStatus() (state, statedata) = self._autobuild_proxy.GetState() - irc.reply("[%s] build of %s is currently %s (%r)" % (status, self._modules[-1], state, dict(statedata))) + irc.reply("[%s %r] build of %s is currently %s (%r)" % (status, dict(statusdata), self._modules[-1], state, dict(statedata))) def build(self, irc, msg, args): if self._autobuild_proxy is None: |