Revision 194e8648

b/lib/masterd/instance.py
273 273

  
274 274
      daemon_name = result.payload
275 275

  
276
      logging.info("Started %s %r on %s", self.MODE_TEXT, daemon_name,
276
      logging.info("Started %s '%s' on %s", self.MODE_TEXT, daemon_name,
277 277
                   self.node_name)
278 278

  
279 279
      self._ts_begin = time.time()
......
294 294

  
295 295
    """
296 296
    if self._daemon_name:
297
      self._lu.LogWarning("Aborting %s %r on %s",
297
      self._lu.LogWarning("Aborting %s '%s' on %s",
298 298
                          self.MODE_TEXT, self._daemon_name, self.node_name)
299 299
      result = self._lu.rpc.call_impexp_abort(self.node_name, self._daemon_name)
300 300
      if result.fail_msg:
301
        self._lu.LogWarning("Failed to abort %s %r on %s: %s",
301
        self._lu.LogWarning("Failed to abort %s '%s' on %s: %s",
302 302
                            self.MODE_TEXT, self._daemon_name,
303 303
                            self.node_name, result.fail_msg)
304 304
        return False
......
375 375
      self._ts_connected = time.time()
376 376

  
377 377
      # TODO: Log remote peer
378
      logging.debug("%s %r on %s is now connected",
378
      logging.debug("%s '%s' on %s is now connected",
379 379
                    self.MODE_TEXT, self._daemon_name, self.node_name)
380 380

  
381 381
      self._cbs.ReportConnected(self, self._private)
......
439 439
    self.final_message = message
440 440

  
441 441
    if success:
442
      logging.info("%s %r on %s succeeded", self.MODE_TEXT, self._daemon_name,
443
                   self.node_name)
442
      logging.info("%s '%s' on %s succeeded", self.MODE_TEXT,
443
                   self._daemon_name, self.node_name)
444 444
    elif self._daemon_name:
445
      self._lu.LogWarning("%s %r on %s failed: %s",
445
      self._lu.LogWarning("%s '%s' on %s failed: %s",
446 446
                          self.MODE_TEXT, self._daemon_name, self.node_name,
447 447
                          message)
448 448
    else:
......
462 462

  
463 463
    """
464 464
    if self._daemon_name:
465
      logging.info("Finalizing %s %r on %s",
465
      logging.info("Finalizing %s '%s' on %s",
466 466
                   self.MODE_TEXT, self._daemon_name, self.node_name)
467 467

  
468 468
      result = self._Finalize()
469 469
      if result.fail_msg:
470
        self._lu.LogWarning("Failed to finalize %s %r on %s: %s",
470
        self._lu.LogWarning("Failed to finalize %s '%s' on %s: %s",
471 471
                            self.MODE_TEXT, self._daemon_name,
472 472
                            self.node_name, result.fail_msg)
473 473
        return False
......
547 547
    if port is not None:
548 548
      self._ts_listening = time.time()
549 549

  
550
      logging.debug("Import %r on %s is now listening on port %s",
550
      logging.debug("Import '%s' on %s is now listening on port %s",
551 551
                    self._daemon_name, self.node_name, port)
552 552

  
553 553
      self._cbs.ReportListening(self, self._private)

Also available in: Unified diff