1
=== modified file 'ibid/core.py'
2
--- ibid/core.py	2009-03-01 14:29:51 +0000
3
+++ ibid/core.py	2009-03-07 16:36:25 +0000
4
@@ -21,6 +21,7 @@
5
21
                processor.process(event)
21
                processor.process(event)
6
22
            except Exception:
22
            except Exception:
7
23
                self.log.exception(u"Exception occured in %s processor of %s plugin", processor.__class__.__name__, processor.name)
23
                self.log.exception(u"Exception occured in %s processor of %s plugin", processor.__class__.__name__, processor.name)
8
24
                event.exceptioned = True
9
24
25
10
25
        print event
26
        print event
11
26
27
12
27
28
13
=== modified file 'ibid/plugins/core.py'
14
--- ibid/plugins/core.py	2009-03-02 09:21:35 +0000
15
+++ ibid/plugins/core.py	2009-03-07 16:36:25 +0000
16
@@ -115,12 +115,18 @@
17
115
class Complain(Processor):
115
class Complain(Processor):
18
116
116
19
117
    priority = 950
117
    priority = 950
22
118
    complaints = Option('complaints', 'Complaint responses', (u'Huh?', u'Sorry...', u'?', u'Excuse me?', u'*blink*', u'What?'))
118
    complaints = Option('complaints', 'Complaint responses',
23
119
    notauthed = Option('notauthed', 'Complaint responses for auth failures', (u"I'm not your bitch", u"Just do it yourself", u"I'm not going to listen to you", u"You're not the boss of me"))
119
            (u'Huh?', u'Sorry...', u'?', u'Excuse me?', u'*blink*', u'What?'))
24
120
    notauthed = Option('notauthed', 'Complaint responses for auth failures',
25
121
            (u"I'm not your bitch", u"Just do it yourself", u"I'm not going to listen to you", u"You're not the boss of me"))
26
122
    exceptioned = Option('exceptioned', 'Complaint responses for exceptions in modules',
27
123
            (u"I'm not feeling too well", u"That didn't go down very well. Burp.", u"That didn't seem to agree with me"))
28
120
124
29
121
    @handler
125
    @handler
30
122
    def complain(self, event):
126
    def complain(self, event):
32
123
        if 'notauthed' in event:
127
        if 'exceptioned' in event:
33
128
            event.addresponse(choice(self.exceptioned))
34
129
        elif 'notauthed' in event:
35
124
            event.addresponse(choice(self.notauthed))
130
            event.addresponse(choice(self.notauthed))
36
125
        else:
131
        else:
37
126
            event.addresponse(choice(self.complaints))
132
            event.addresponse(choice(self.complaints))
38
127
133
39
=== modified file 'ibid/plugins/test.py'
40
--- ibid/plugins/test.py	2009-03-01 14:29:51 +0000
41
+++ ibid/plugins/test.py	2009-03-07 16:36:25 +0000
42
@@ -30,7 +30,6 @@
43
30
30
44
31
    @match(r'^raise\s+exception$')
31
    @match(r'^raise\s+exception$')
45
32
    def handler(self, event):
32
    def handler(self, event):
46
33
        event.addresponse("I'll except in a moment")
47
34
        raise Exception("Ow, that hurt.")
33
        raise Exception("Ow, that hurt.")
48
35
34
49
36
# vi: set et sta sw=4 ts=4:
35
# vi: set et sta sw=4 ts=4:
50
37
36
51
=== modified file 'scripts/ibid-plugin'
52
--- scripts/ibid-plugin	2009-03-02 07:31:43 +0000
53
+++ scripts/ibid-plugin	2009-03-07 16:36:25 +0000
54
@@ -77,6 +77,7 @@
55
77
            processor.process(event)
77
            processor.process(event)
56
78
        except Exception:
78
        except Exception:
57
79
            log.exception(u"Exception occured in %s processor of %s plugin", processor.__class__.__name__, processor.name)
79
            log.exception(u"Exception occured in %s processor of %s plugin", processor.__class__.__name__, processor.name)
58
80
            event.exceptioned = True
59
80
81
60
81
    for response in event.responses:
82
    for response in event.responses:
61
82
        if isinstance(response, dict):
83
        if isinstance(response, dict):
Reviewer	Date Requested	Status
Jonathan Hitchcock		Approve on 2009-03-10
Michael Gorven	2009-03-07	Approve on 2009-03-09
Review via email: mp+4269@code.launchpad.net