Streamline output: Exception messages

[bup.git] / cmd / server-cmd.py

diff --git a/cmd/server-cmd.py b/cmd/server-cmd.py
index 43a3fce5c1a0539bb3552be243f8108a0c1c983d..a7f00ba8cd0857bcc4c04f08e2e685c56135f894 100755 (executable)
--- a/cmd/server-cmd.py
+++ b/cmd/server-cmd.py
@@ -15,7 +15,7 @@ def do_help(conn, junk):
 def _set_mode():
     global dumb_server_mode
     dumb_server_mode = os.path.exists(git.repo('bup-dumb-server'))
-    debug1('bup server: serving in %s mode\n' 
+    debug1('bup server: Serving in %s mode.'
            % (dumb_server_mode and 'dumb' or 'smart'))
 
 
@@ -26,13 +26,13 @@ def _init_session(reinit_with_new_repopath=None):
     # OK. we now know the path is a proper repository. Record this path in the
     # environment so that subprocesses inherit it and know where to operate.
     os.environ['BUP_DIR'] = git.repodir
-    debug1('bup server: bupdir is %r\n' % git.repodir)
+    debug1('bup server: bupdir is "%r".' % git.repodir)
     _set_mode()
 
 
 def init_dir(conn, arg):
     git.init_repo(arg)
-    debug1('bup server: bupdir initialized: %r\n' % git.repodir)
+    debug1('bup server: bupdir initialized: "%r".' % git.repodir)
     _init_session(arg)
     conn.ok()
 
@@ -79,11 +79,11 @@ def receive_objects_v2(conn, junk):
         ns = conn.read(4)
         if not ns:
             w.abort()
-            raise Exception('object read: expected length header, got EOF\n')
+            raise Exception('Object read: expected length header, got EOF')
         n = struct.unpack('!I', ns)[0]
-        #debug2('expecting %d bytes\n' % n)
+        #debug2('expecting %d bytes' % n)
         if not n:
-            debug1('bup server: received %d object%s.\n' 
+            debug1('bup server: Received %d object%s.'
                 % (w.count, w.count!=1 and "s" or ''))
             fullpath = w.close(run_midx=not dumb_server_mode)
             if fullpath:
@@ -92,17 +92,17 @@ def receive_objects_v2(conn, junk):
             conn.ok()
             return
         elif n == 0xffffffff:
-            debug2('bup server: receive-objects suspended.\n')
+            debug2('bup server: Receive-objects suspended.')
             suspended_w = w
             conn.ok()
             return
-            
+
         shar = conn.read(20)
         crcr = struct.unpack('!I', conn.read(4))[0]
         n -= 20 + 4
         buf = conn.read(n)  # object sizes in bup are reasonably small
-        #debug2('read %d bytes\n' % n)
-        _check(w, n, len(buf), 'object read: expected %d bytes, got %d\n')
+        #debug2('read %d bytes' % n)
+        _check(w, n, len(buf), 'Object read: Expected %d bytes, got %d\n')
         if not dumb_server_mode:
             oldpack = w.exists(shar, want_source=True)
             if oldpack:
@@ -110,15 +110,15 @@ def receive_objects_v2(conn, junk):
                 assert(oldpack.endswith('.idx'))
                 (dir,name) = os.path.split(oldpack)
                 if not (name in suggested):
-                    debug1("bup server: suggesting index %s\n"
+                    debug1("bup server: Suggesting index %s"
                            % git.shorten_hash(name))
-                    debug1("bup server:   because of object %s\n"
+                    debug1("bup server:   because of object %s"
                            % shar.encode('hex'))
                     conn.write('index %s\n' % name)
                     suggested.add(name)
                 continue
         nw, crc = w._raw_write((buf,), sha=shar)
-        _check(w, crcr, crc, 'object read: expected crc %d, got %d\n')
+        _check(w, crcr, crc, 'Object read: Expected CRC %d, got %d\n')
     # NOTREACHED
     
 
@@ -154,7 +154,7 @@ def cat(conn, id):
             conn.write(struct.pack('!I', len(blob)))
             conn.write(blob)
     except KeyError, e:
-        log('server: error: %s\n' % e)
+        log('bup server: Error: %s' % e)
         conn.write('\0\0\0\0')
         conn.error(e)
     else:
@@ -171,7 +171,7 @@ o = options.Options(optspec)
 if extra:
     o.fatal('no arguments expected')
 
-debug2('bup server: reading from stdin.\n')
+debug2('bup server: Reading from stdin.')
 
 commands = {
     'quit': None,
@@ -194,7 +194,7 @@ for _line in lr:
     line = _line.strip()
     if not line:
         continue
-    debug1('bup server: command: %r\n' % line)
+    debug1('bup server: Command: "%r" ...' % line)
     words = line.split(' ', 1)
     cmd = words[0]
     rest = len(words)>1 and words[1] or ''
@@ -205,6 +205,6 @@ for _line in lr:
         if cmd:
             cmd(conn, rest)
         else:
-            raise Exception('unknown server command: %r\n' % line)
+            raise Exception('Unknown server command: "%r"' % line)
 
-debug1('bup server: done\n')
+debug1('bup server: Done.')