o2on svn commit
o2on-****@lists*****
2009年 8月 9日 (日) 15:09:13 JST
Revision: 159
http://sourceforge.jp/projects/o2on/svn/view?view=rev&revision=159
Author: nawota
Date: 2009-08-09 15:09:13 +0900 (Sun, 09 Aug 2009)
Log Message:
-----------
Use errno pacakge instead of direct number.
Modified Paths:
--------------
trunk/opy2on/lib/o2on_job.py
trunk/opy2on/lib/o2on_key.py
trunk/opy2on/lib/o2on_node.py
trunk/opy2on/lib/o2on_server.py
Modified: trunk/opy2on/lib/o2on_job.py
===================================================================
--- trunk/opy2on/lib/o2on_job.py 2009-08-09 05:06:20 UTC (rev 158)
+++ trunk/opy2on/lib/o2on_job.py 2009-08-09 06:09:13 UTC (rev 159)
@@ -15,6 +15,7 @@
import httplib
import traceback
import sys
+import errno
import o2on_server
import o2on_config
@@ -44,7 +45,7 @@
try:
os.makedirs(o2on_config.ProfileDir)
except OSError, inst:
- if inst.errno != 17: raise inst
+ if inst.errno != errno.EEXIST: raise inst
profname = os.path.join(o2on_config.ProfileDir,
"o2on_"+"_".join(self.name.split(" "))+".prof")
cProfile.runctx('self.dummy()', None, {'self':self,}, profname)
Modified: trunk/opy2on/lib/o2on_key.py
===================================================================
--- trunk/opy2on/lib/o2on_key.py 2009-08-09 05:06:20 UTC (rev 158)
+++ trunk/opy2on/lib/o2on_key.py 2009-08-09 06:09:13 UTC (rev 159)
@@ -15,6 +15,7 @@
import datetime
import hashlib
import time
+import errno
from o2on_const import KeyDBFile, regHosts
import o2on_config
@@ -145,7 +146,7 @@
pipe.close()
proc.wait()
except IOError, inst:
- if inst.errno == 32:pass # Broken pipe
+ if inst.errno == errno.EPIPE:pass # Broken pipe
else: raise inst
self.glob.logger.log("KEYDB", "Finished to show keys")
def key_list(self):
Modified: trunk/opy2on/lib/o2on_node.py
===================================================================
--- trunk/opy2on/lib/o2on_node.py 2009-08-09 05:06:20 UTC (rev 158)
+++ trunk/opy2on/lib/o2on_node.py 2009-08-09 06:09:13 UTC (rev 159)
@@ -16,6 +16,7 @@
import threading
import random
import time
+from errno import EHOSTUNREACH, ECONNREFUSED, ETIMEDOUT, ECONNRESET
import o2on_config
from o2on_util import hash_xor_bitlength
@@ -171,8 +172,8 @@
errno = None
if hasattr(inst, 'errno'): errno = inst.errno
else: errno = inst[0]
- if errno in (113, 111): raise NodeRemovable
- if errno in (110, 104): raise NodeRefused
+ if errno in (EHOSTUNREACH, ETIMEDOUT): raise NodeRemovable
+ if errno in (ECONNREFUSED, ECONNRESET): raise NodeRefused
else: raise inst
except httplib.BadStatusLine:
socket.setdefaulttimeout(None)
Modified: trunk/opy2on/lib/o2on_server.py
===================================================================
--- trunk/opy2on/lib/o2on_server.py 2009-08-09 05:06:20 UTC (rev 158)
+++ trunk/opy2on/lib/o2on_server.py 2009-08-09 06:09:13 UTC (rev 159)
@@ -21,6 +21,7 @@
from xml.parsers.expat import ExpatError
import threading
import select
+from errno import ECONNRESET, EPIPE, ETIMEDOUT
import o2on_config
from o2on_const import regHosts, ProtocolVer, AppName
@@ -65,7 +66,7 @@
self.handle_request()
self.__is_shut_down.set()
def shutdown(self):
- for r in []:#self.requests:
+ for r in self.requests:
try:
r.shutdown(socket.SHUT_RDWR)
r.close()
@@ -87,7 +88,7 @@
if isinstance(inst, socket.error):
if hasattr(inst, 'errno'): errno = inst.errno # 2.6
else: errno = inst[0] # 2.5
- if errno in (104, 32, 110, 54):
+ if errno in (ECONNRESET, EPIPE, ETIMEDOUT):
pass
else:
if o2on_config.OutputErrorFile:
@@ -709,7 +710,7 @@
self.send_nav(cur)
def datq(self, args):
datq = self.server.glob.datquery
- self.send_common("im", "Searching Dats")
+ self.send_common("datq", "Searching Dats")
self.wfile.write("""\
<div class='section'>
<h2 class='section_title'>検索中dat</h2>