1
=== modified file 'hooks/common.py'
2
--- hooks/common.py	2019-02-03 14:50:36 +0000
3
+++ hooks/common.py	2019-05-28 09:45:15 +0000
4
@@ -119,6 +119,11 @@
5
119
            exit_code = self.try_to_register()
119
            exit_code = self.try_to_register()
6
120
            if exit_code == 0:
120
            if exit_code == 0:
7
121
                self.status_set("active", "System successfully registered")
121
                self.status_set("active", "System successfully registered")
8
122
                log("Client config updated, system successfully registered")
9
123
            else:
10
124
                self.status_set("maintenance", "Client registration fails")
11
125
                log("Client config updated, tried registration but failed")
12
126
                log("Exit code: %s" % exit_code)
13
122
        else:
127
        else:
14
123
            if not self.config.get("account_name"):
128
            if not self.config.get("account_name"):
15
124
                self.status_set(
129
                self.status_set(
16
@@ -179,11 +184,22 @@
17
179
        try:
184
        try:
18
180
            setup(config)
185
            setup(config)
19
181
        except ConfigurationError as error:
186
        except ConfigurationError as error:
20
187
            log("%s: Configuration error" % self.local_unit)
21
182
            print >> sys.stderr, "Configuration error: %s" % (str(error),)
188
            print >> sys.stderr, "Configuration error: %s" % (str(error),)
22
183
            error_handler.flag_error(1)
189
            error_handler.flag_error(1)
23
184
        else:
190
        else:
24
185
            log("Registering %s" % self.local_unit)
191
            log("Registering %s" % self.local_unit)
26
186
            register(config, on_error=error_handler.flag_error)
192
            result = 0
27
193
            try:
28
194
                result = register(config, on_error=error_handler.flag_error)
29
195
                log("Registration result is %s" % str(result))
30
196
            except SystemExit:
31
197
                log("Registration unsuccessful, SystemExit() happened")
32
198
                log("Check broker log or try manual registration")
33
199
                log(result)
34
200
                error_handler.flag_error(1)
35
201
36
202
        log("Registration exit_code = %s" % error_handler.exit_code)
37
187
        return error_handler.exit_code
203
        return error_handler.exit_code
38
188
204
39
189
205
Reviewer	Review Type	Date Requested	Status
🤖 Landscape Builder	test results		Needs Fixing on 2020-09-27
Landscape		2019-05-27	Pending
Review via email: mp+367966@code.launchpad.net