revised all error handlers

diff --git a/p2pool/bitcoin/p2p.py b/p2pool/bitcoin/p2p.py
index 852643b..9ffb9c5 100644 (file)
--- a/p2pool/bitcoin/p2p.py
+++ b/p2pool/bitcoin/p2p.py
@@ -49,8 +49,7 @@ class BaseProtocol(protocol.Protocol):
                         continue
                     assert not len(payload) > self.max_payload_length
                 except:
-                    print 'FAILURE DECOMPRESSING'
-                    log.err()
+                    log.err(None, 'Failure decompressing message:')
                     continue
             else:
                 if len(compressed_payload) > self.max_payload_length:
@@ -74,7 +73,7 @@ class BaseProtocol(protocol.Protocol):
                 payload2 = type_.unpack(payload)
             except:
                 print 'RECV', command, checksum.encode('hex') if checksum is not None else None, repr(payload.encode('hex')), len(payload)
-                log.err()
+                log.err(None, 'Error parsing message: (see RECV line)')
                 continue
             
             handler = getattr(self, 'handle_' + command, None)
@@ -89,7 +88,7 @@ class BaseProtocol(protocol.Protocol):
                 handler(**payload2)
             except:
                 print 'RECV', command, checksum.encode('hex') if checksum is not None else None, repr(payload.encode('hex')), len(payload)
-                log.err()
+                log.err(None, 'Error handling message: (see RECV line)')
                 continue
     
     def sendPacket(self, command, payload2):

diff --git a/p2pool/data.py b/p2pool/data.py
index ea12863..bb32016 100644 (file)
--- a/p2pool/data.py
+++ b/p2pool/data.py
@@ -304,10 +304,7 @@ class OkayTracker(bitcoin_data.Tracker):
         try:
             share.check(self, now, self.net)
         except:
-            print
-            print 'Share check failed:'
-            log.err()
-            print
+            log.err(None, 'Share check failed:')
             return False
         else:
             self.verified.add(share)

diff --git a/p2pool/main.py b/p2pool/main.py
index 278fb19..fbaf6df 100644 (file)
--- a/p2pool/main.py
+++ b/p2pool/main.py
@@ -240,10 +240,7 @@ def main(args):
         try:
             nodes.append(((yield reactor.resolve('p2pool.forre.st')), args.net.P2P_PORT))
         except:
-            print
-            print 'Error resolving bootstrap node IP:'
-            log.err()
-            print
+            log.err(None, 'Error resolving bootstrap node IP:')
         
         p2p_node = p2p.Node(
             current_work=current_work,
@@ -358,10 +355,7 @@ def main(args):
                 # eg. good = share.hash == current_work.value['best_share_hash'] here
                 return good
             except:
-                print
-                print 'Error processing data received from worker:'
-                log.err()
-                print
+                log.err(None, 'Error processing data received from worker:')
                 return False
         
         def get_rate():
@@ -426,10 +420,7 @@ def main(args):
                 #print "GOT", tx
                 tx_pool[bitcoin.data.tx_type.hash256(tx)] = Tx(tx, current_work.value['previous_block'])
             except:
-                print
-                print 'Error handling tx:'
-                log.err()
-                print
+                log.err(None, 'Error handling tx:')
         # disable for now, for testing impact on stales
         #factory.new_tx.watch(new_tx)
         
@@ -488,10 +479,7 @@ def main(args):
             except:
                 log.err()
     except:
-        print
-        print 'Fatal error:'
-        log.err()
-        print
+        log.err(None, 'Fatal error:')
         reactor.stop()
 
 def run():

diff --git a/p2pool/util/deferral.py b/p2pool/util/deferral.py
index 90e9918..600fd90 100644 (file)
--- a/p2pool/util/deferral.py
+++ b/p2pool/util/deferral.py
@@ -25,11 +25,7 @@ def retry(message, delay):
                 try:
                     result = yield func(*args, **kwargs)
                 except:
-                    print
-                    print message
-                    log.err()
-                    print
-                    
+                    log.err(None, message)
                     yield sleep(delay)
                 else:
                     defer.returnValue(result)

diff --git a/p2pool/util/jsonrpc.py b/p2pool/util/jsonrpc.py
index 287ca63..0d5473c 100644 (file)
--- a/p2pool/util/jsonrpc.py
+++ b/p2pool/util/jsonrpc.py
@@ -125,8 +125,7 @@ class Server(deferred_resource.DeferredResource):
             except Error:
                 raise
             except Exception:
-                print 'Squelched JSON method error:'
-                log.err()
+                log.err(None, 'Squelched JSON method error:')
                 raise Error(-32099, u'Unknown error')
             
             if id_ is None: