← Back to branch summary

~bigkevmcd/landscape-client/detect-vmware

« back to all changes in this revision

Viewing changes to landscape/package/reporter.py

Merge package-reporter-result [r=sidnei,free.ekanayaka] [f=780406]

Report the package reporter result even in case of success, not just in case of
failure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
landscape/package/reporter.py
201
201
            logging.debug("'%s' exited with status %d (out='%s', err='%s'" % (
202
202
                self.smart_update_filename, code, out, err))
203
203
            touch_file(self._config.smart_update_stamp_filename)
204
 
            if smart_failed:
205
 
                deferred = self._broker.call_if_accepted(
206
 
                    "package-reporter-error", self.send_error, code, err)
207
 
            else:
208
 
                deferred = succeed(None)
 
204
            deferred = self._broker.call_if_accepted(
 
205
                "package-reporter-result", self.send_result, code, err)
209
206
            deferred.addCallback(lambda ignore: (out, err, code))
210
207
            return deferred
211
208
 
212
209
        result.addCallback(callback)
213
210
        return result
214
211
 
215
 
    def send_error(self, code, err):
 
212
    def send_result(self, code, err):
216
213
        """
217
 
        If an error happened in smart update, reports it to the server in a
218
 
        message.
 
214
        Report the package reporter result to the server in a message.
219
215
        """
220
216
        message = {
221
 
            "type": "package-reporter-error",
222
 
            "error-code": code,
223
 
            "error-text": err}
 
217
            "type": "package-reporter-result",
 
218
            "code": code,
 
219
            "err": err}
224
220
        return self._broker.send_message(message, True)
225
221
 
226
222
    def handle_task(self, task):