Author: saces
Date: 2009-03-18 15:31:09 +0000 (Wed, 18 Mar 2009)
New Revision: 26095
Modified:
trunk/apps/pyFreenetHg/FreenetHg.py
trunk/apps/pyFreenetHg/ReadMe.html
Log:
version 0.2.1
- fix socket blocking issue, speed fcp up
- set default timeout to 30 min
Modified: trunk/apps/pyFreenetHg/FreenetHg.py
===================================================================
--- trunk/apps/pyFreenetHg/FreenetHg.py 2009-03-18 13:26:14 UTC (rev 26094)
+++ trunk/apps/pyFreenetHg/FreenetHg.py 2009-03-18 15:31:09 UTC (rev 26095)
@@ -87,7 +87,7 @@
DEFAULT_FCP_HOST = "127.0.0.1"
DEFAULT_FCP_PORT = 9481
-DEFAULT_FCP_TIMEOUT = 300
+DEFAULT_FCP_TIMEOUT = 1800
# utils
def _getUniqueId():
@@ -113,6 +113,7 @@
self._logger = logger
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.socket.settimeout(timeout)
+ self.socket.setsockopt(socket.SOL_TCP, socket.TCP_NODELAY, 1)
try:
self.socket.connect((host, port))
except Exception, e:
@@ -1519,7 +1520,7 @@
fp.close()
ui.write("New config succesfully written.\n")
else:
- ui.write("Nothing changed, config not written.\n")
+ ui.write("Nothing changed, config not written.\n")
finally:
del lock
Modified: trunk/apps/pyFreenetHg/ReadMe.html
===================================================================
--- trunk/apps/pyFreenetHg/ReadMe.html 2009-03-18 13:26:14 UTC (rev 26094)
+++ trunk/apps/pyFreenetHg/ReadMe.html 2009-03-18 15:31:09 UTC (rev 26095)
@@ -8,8 +8,8 @@
<body style="margin: 1cm">
<p> </p>
<h1>Freenet & mercurial</h1>
-<p><a href="/?newbookmark=USK at
MYLAnId-ZEyXhDGGbYOa1gOtkZZrFNTXjFl1dibLj9E,Xpu27DoAKKc8b0718E-ZteFrGqCYROe7XBBJI57pB4M,AQACAAE/pyFreenetHg/30/&desc=Freenet
and Mercurial" target="_blank">add to bookmarks: Freenet and Mercurial</a></p>
-<p><a href="/?newbookmark=USK at
fQGiK~CfI8zO4cuNyhPRLqYZ5TyGUme8lMiRnS9TCaU,E3S1MLoeeeEM45fDLdVV~n8PCr9pt6GMq0tuH4dRP7c,AQACAAE/freenethg/82/&desc=Freenet
and Mercurial (repository)" target="_blank">add to bookmarks: Freenet and
Mercurial (repository)</a></p>
+<p><a href="/?newbookmark=USK at
MYLAnId-ZEyXhDGGbYOa1gOtkZZrFNTXjFl1dibLj9E,Xpu27DoAKKc8b0718E-ZteFrGqCYROe7XBBJI57pB4M,AQACAAE/pyFreenetHg/31/&desc=Freenet
and Mercurial" target="_blank">add to bookmarks: Freenet and Mercurial</a></p>
+<p><a href="/?newbookmark=USK at
fQGiK~CfI8zO4cuNyhPRLqYZ5TyGUme8lMiRnS9TCaU,E3S1MLoeeeEM45fDLdVV~n8PCr9pt6GMq0tuH4dRP7c,AQACAAE/freenethg/83/&desc=Freenet
and Mercurial (repository)" target="_blank">add to bookmarks: Freenet and
Mercurial (repository)</a></p>
<p> </p>
<h2><a name="toc">Table of Content</a></h2>
<ul>
@@ -87,7 +87,7 @@
<h3><a name="requirements">Requirements</a></h3>
<p>
-python >= 2.4<br>
+python >= 2.5<br>
mercurial >= 1.1.2+<br>
last not least: a running freenet node ;)<br>
knowledge about hg native commands <em>bundle/unbundle</em><br>
@@ -95,10 +95,11 @@
</p>
<h3><a name="download">Download</a></h3>
<p><a href="FreenetHg.py" target="_blank">download latest testverion from
here</a></p>
+<p><a href="/SSK at
MYLAnId-ZEyXhDGGbYOa1gOtkZZrFNTXjFl1dibLj9E,Xpu27DoAKKc8b0718E-ZteFrGqCYROe7XBBJI57pB4M,AQACAAE/pyFreenetHg-31/FreenetHg.py"
target="_blank">download version 0.2.1 from here</a></p>
<p><a href="/SSK at
MYLAnId-ZEyXhDGGbYOa1gOtkZZrFNTXjFl1dibLj9E,Xpu27DoAKKc8b0718E-ZteFrGqCYROe7XBBJI57pB4M,AQACAAE/pyFreenetHg-30/FreenetHg.py"
target="_blank">download version 0.2 from here</a></p>
<p><a href="/SSK at
MYLAnId-ZEyXhDGGbYOa1gOtkZZrFNTXjFl1dibLj9E,Xpu27DoAKKc8b0718E-ZteFrGqCYROe7XBBJI57pB4M,AQACAAE/pyFreenetHg-20/FreenetHg.py"
target="_blank">download version 0.1.1 from here</a></p>
<p>or get the working repository here:<br>
-hg clone|pull static-http://127.0.0.1:8888/USK at
fQGiK~CfI8zO4cuNyhPRLqYZ5TyGUme8lMiRnS9TCaU,E3S1MLoeeeEM45fDLdVV~n8PCr9pt6GMq0tuH4dRP7c,AQACAAE/freenethg/82/ /tmp/your/local/path</p>
+hg clone|pull static-http://127.0.0.1:8888/USK at
fQGiK~CfI8zO4cuNyhPRLqYZ5TyGUme8lMiRnS9TCaU,E3S1MLoeeeEM45fDLdVV~n8PCr9pt6GMq0tuH4dRP7c,AQACAAE/freenethg/83/ /tmp/your/local/path</p>
<h3><a name="installation">Installation</a></h3>
<p><strong><em>Important hint:</em></strong> Do not store url encoded keys
into hgrc (USK%40MY). Python does not like '%' here!</p>
@@ -124,7 +125,7 @@
<ul>
<li>fcp host: 127.0.0.1</li>
<li>fcp port: 9481</li>
-<li>fcp timeout: 5 minutes</li>
+<li>fcp timeout: 30 minutes</li>
</ul>
<h4><a name="conf_environment">Environment variables</a></h4>
The following environment variables are supported:
@@ -197,7 +198,7 @@
<dl>
<dt>--fcphost hostnameorip</dt><dd>specify fcphost if not 127.0.0.1</dd>
<dt>--fcpport portnumber</dt><dd>specify fcpport if not 9481</dd>
-<dt>--fcptimeout seconds</dt><dd>specify fcp timeout if not 5 minutes</dd>
+<dt>--fcptimeout seconds</dt><dd>specify fcp timeout if not 30 minutes</dd>
<dt>--fcplog</dt><dd>log fcp to mercurials output</dd>
<dt>--fcpnoversion</dt><dd>omit fcp version check</dd>
</dl>
@@ -272,7 +273,7 @@
<dl>
<dt>FCPLog</dt><dd>if the parameter is set, any value turns logging on
(<em>default: off</em>)</dd>
<dt>NoVersion</dt><dd>if the parameter is set, any value turns the fcp version
check off (<em>default: on</em>)</dd>
-<dt>Timeout</dt><dd>set timeout to the amount of seconds (<em>default:
300</em>)</dd>
+<dt>Timeout</dt><dd>set timeout to the amount of seconds (<em>default:
1800</em>)</dd>
</dl>
</li>
<li>command parameters
@@ -287,8 +288,8 @@
fcp://127.0.0.1:9481/USK at
fQGiK~CfI8zO4cuNyhPRLqYZ5TyGUme8lMiRnS9TCaU,E3S1MLoeeeEM45fDLdVV~n8PCr9pt6GMq0tuH4dRP7c,AQACAAE/freenethg/54/
fcp:///USK at
fQGiK~CfI8zO4cuNyhPRLqYZ5TyGUme8lMiRnS9TCaU,E3S1MLoeeeEM45fDLdVV~n8PCr9pt6GMq0tuH4dRP7c,AQACAAE/freenethg/54/
fcp:USK at
fQGiK~CfI8zO4cuNyhPRLqYZ5TyGUme8lMiRnS9TCaU,E3S1MLoeeeEM45fDLdVV~n8PCr9pt6GMq0tuH4dRP7c,AQACAAE/freenethg/54/
-fcp://127.0.0.1:9481/USK at
fQGiK~CfI8zO4cuNyhPRLqYZ5TyGUme8lMiRnS9TCaU,E3S1MLoeeeEM45fDLdVV~n8PCr9pt6GMq0tuH4dRP7c,AQACAAE/freenethg/54/;FCPLog=true&TimeOut=300?Priority=1&MaxRetries=5
-fcp://127.0.0.1:9481/USK at
fQGiK~CfI8zO4cuNyhPRLqYZ5TyGUme8lMiRnS9TCaU,E3S1MLoeeeEM45fDLdVV~n8PCr9pt6GMq0tuH4dRP7c,AQACAAE/freenethg/54/?Priority=0&MaxRetries=-1
+fcp://127.0.0.1:9481/USK at
fQGiK~CfI8zO4cuNyhPRLqYZ5TyGUme8lMiRnS9TCaU,E3S1MLoeeeEM45fDLdVV~n8PCr9pt6GMq0tuH4dRP7c,AQACAAE/freenethg/54/;FCPLog=true&TimeOut=300?Priority=1&MaxRetries=5
+fcp://127.0.0.1:9481/USK at
fQGiK~CfI8zO4cuNyhPRLqYZ5TyGUme8lMiRnS9TCaU,E3S1MLoeeeEM45fDLdVV~n8PCr9pt6GMq0tuH4dRP7c,AQACAAE/freenethg/54/?Priority=0&MaxRetries=-1
</pre>
</li>
