[26411] in Source-Commits
Re: /svn/athena r25552 - in trunk/debathena/debathena/moira-gui: .
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Sun Jun 3 14:43:12 2012
Date: Sun, 3 Jun 2012 14:43:09 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <0710218D-F2AD-4D05-860A-7F8B58F155F0@MIT.EDU>
Message-ID: <alpine.GSO.1.10.1206031441061.18441@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
On Sun, 3 Jun 2012, Jonathan Reed wrote:
>
> On Jun 3, 2012, at 1:18 PM, Benjamin Kaduk wrote:
>
>> On Sun, 3 Jun 2012, Jonathan D Reed wrote:
>>
>>> Author: jdreed
>>> Date: 2012-06-03 12:28:23 -0400 (Sun, 03 Jun 2012)
>>> New Revision: 25552
>>>
>>> Modified:
>>> trunk/debathena/debathena/moira-gui/debian/changelog
>>> trunk/debathena/debathena/moira-gui/xmoira
>>> Log:
>>> In moira-gui:
>>> * Fail if we can't auth to moira.
>>>
>>>
>>> Modified: trunk/debathena/debathena/moira-gui/xmoira
>>> ===================================================================
>>> --- trunk/debathena/debathena/moira-gui/xmoira 2012-06-03 15:26:35 UTC (rev 25551)
>>> +++ trunk/debathena/debathena/moira-gui/xmoira 2012-06-03 16:28:23 UTC (rev 25552)
>>> @@ -20,6 +20,7 @@
>>>
>>> class XMoira():
>>> def __init__(self):
>>> + self.running=False
>>> self.widgets = gtk.glade.XML(gladeFile)
>>> self.window = self.widgets.get_widget("mainWindow")
>>> self.widgets.signal_autoconnect(self)
>>> @@ -157,7 +158,14 @@
>>> if self.connected:
>>> return
>>> moira.connect()
>>> - moira.auth(self.clientName)
>>> + try:
>>> + moira.auth(self.clientName)
>>> + except moira.MoiraException, e:
>>> + self.errorDialog("Unable to authenticate to Moira: %s" % (e.args[1]), True)
>>> + if self.running:
>>> + self.quit()
>>
>> self.quit() just calls gtk.main_quit() ... do we really recurse the GTK main loop (or does just do the same thing as sys.exit)?
>> A comment would probably be in order, as done in __init__ while handling mrclient.MoiraClientException ...
>> If we don't actually need to use gtk.main_quit(), then self.running would no longer be needed.
>
> sys.exit() won't work in certain cases inside an event handler. And
Huh, really? That's unfortunate and unexpected...
> calling gtk_main_quit outside a mainloop results in an exception.
Right.
Hmm, I didn't check if there was anywhere where we would want to set
self.running back to False. (I guess it would probably be in quit() if
anywhere.) My intuition says we probably don't need to, though...
-Ben
