Consume ping errors so they aren't printed in the log.

[quix0rs-apt-p2p.git] / apt_p2p / apt_p2p_conf.py

diff --git a/apt_p2p/apt_p2p_conf.py b/apt_p2p/apt_p2p_conf.py
index de7cc60aea95e225c99d87bb505e171df8545038..81fb177ddc42ef1237febeab7366d14951180f3c 100644 (file)
--- a/apt_p2p/apt_p2p_conf.py
+++ b/apt_p2p/apt_p2p_conf.py
@@ -23,7 +23,19 @@ class ConfigError(Exception):
     def __str__(self):
         return repr(self.message)
 
-version = versions.Version('apt-p2p', 0, 1, 0)
+version = versions.Version('apt-p2p', 0, 1, 4)
+
+mapbase64 = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-'
+versionID = 'A'
+for subver in version.base().split('.', 2):
+    while type(subver) != int and len(subver) > 0:
+        try:
+            subver = int(subver)
+        except:
+            subver = subver[:-1]
+    if type(subver) != int or subver >= 64:
+        subver = 0
+    versionID += mapbase64[subver]
 
 # Set the home parameter
 home = os.path.expandvars('${HOME}')
@@ -97,10 +109,10 @@ DHT_DEFAULTS = {
     
     ### SEARCHING/STORING
     # concurrent xmlrpc calls per find node/value request!
-    'CONCURRENT_REQS': '4',
+    'CONCURRENT_REQS': '8',
     
     # how many hosts to post to
-    'STORE_REDUNDANCY': '3',
+    'STORE_REDUNDANCY': '6',
     
     # How many values to attempt to retrieve from the DHT.
     # Setting this to 0 will try and get all values (which could take a while if
@@ -124,14 +136,14 @@ DHT_DEFAULTS = {
     'KEY_EXPIRE': '3h', # 3 hours
     
     # Timeout KRPC requests to nodes after this time.
-    'KRPC_TIMEOUT': '14s',
+    'KRPC_TIMEOUT': '9s',
     
     # KRPC requests are resent using exponential backoff starting with this delay.
     # The request will first be resent after the delay set here.
     # The request will be resent again after twice the delay set here. etc.
-    # e.g. if TIMEOUT is 14 sec., and INITIAL_DELAY is 2 sec., then requests will
+    # e.g. if TIMEOUT is 9 sec., and INITIAL_DELAY is 2 sec., then requests will
     # be resent at times 0, 2 (2 sec. later), and 6 (4 sec. later), and then will
-    # timeout at 14.
+    # timeout at 9.
     'KRPC_INITIAL_DELAY': '2s',
 
     # whether to spew info about the requests/responses in the protocol