Revision c9300bb3

b/lib/masterd/instance.py
1 1
#
2 2
#
3 3

  
4
# Copyright (C) 2010 Google Inc.
4
# Copyright (C) 2010, 2011 Google Inc.
5 5
#
6 6
# This program is free software; you can redistribute it and/or modify
7 7
# it under the terms of the GNU General Public License as published by
......
196 196

  
197 197
    """
198 198
    if self._daemon:
199
      return self._daemon.recent_output
199
      return "\n".join(self._daemon.recent_output)
200 200

  
201 201
    return None
202 202

  
......
869 869
    if ie.success:
870 870
      self.feedback_fn("%s finished sending data" % dtp.data.name)
871 871
    else:
872
      self.feedback_fn("%s failed to send data: %s (recent output: %r)" %
872
      self.feedback_fn("%s failed to send data: %s (recent output: %s)" %
873 873
                       (dtp.data.name, ie.final_message, ie.recent_output))
874 874

  
875 875
    dtp.RecordResult(ie.success)
......
919 919
    if ie.success:
920 920
      self.feedback_fn("%s finished receiving data" % dtp.data.name)
921 921
    else:
922
      self.feedback_fn("%s failed to receive data: %s (recent output: %r)" %
922
      self.feedback_fn("%s failed to receive data: %s (recent output: %s)" %
923 923
                       (dtp.data.name, ie.final_message, ie.recent_output))
924 924

  
925 925
    dtp.RecordResult(ie.success)
......
1120 1120
    if ie.success:
1121 1121
      self._feedback_fn("Disk %s finished sending data" % idx)
1122 1122
    else:
1123
      self._feedback_fn("Disk %s failed to send data: %s (recent output: %r)" %
1123
      self._feedback_fn("Disk %s failed to send data: %s (recent output: %s)" %
1124 1124
                        (idx, ie.final_message, ie.recent_output))
1125 1125

  
1126 1126
    self._dresults[idx] = bool(ie.success)
......
1407 1407
      self._feedback_fn("Disk %s finished receiving data" % idx)
1408 1408
    else:
1409 1409
      self._feedback_fn(("Disk %s failed to receive data: %s"
1410
                         " (recent output: %r)") %
1410
                         " (recent output: %s)") %
1411 1411
                        (idx, ie.final_message, ie.recent_output))
1412 1412

  
1413 1413
    self._dresults[idx] = bool(ie.success)

Also available in: Unified diff