Author: aum
Date: 2006-06-08 09:23:40 +0000 (Thu, 08 Jun 2006)
New Revision: 9084
Modified:
trunk/apps/pyFreenet/code.leo
trunk/apps/pyFreenet/fcp/node.py
trunk/apps/pyFreenet/fcpget
trunk/apps/pyFreenet/fcpget.py
trunk/apps/pyFreenet/fcpput
trunk/apps/pyFreenet/fcpput.py
trunk/apps/pyFreenet/manpages/fcpget.1
trunk/apps/pyFreenet/manpages/fcpget.1.html
trunk/apps/pyFreenet/manpages/fcpput.1
trunk/apps/pyFreenet/manpages/fcpput.1.html
Log:
Changed default priority for all tools and lib to 4 (was 2)
Modified: trunk/apps/pyFreenet/code.leo
===================================================================
--- trunk/apps/pyFreenet/code.leo 2006-06-08 09:15:19 UTC (rev 9083)
+++ trunk/apps/pyFreenet/code.leo 2006-06-08 09:23:40 UTC (rev 9084)
@@ -41,7 +41,7 @@
<v t="aum.20060506231352.1"><vh>genkey</vh></v>
<v t="aum.20060506231352"><vh>get</vh></v>
<v t="aum.20060507003931"><vh>put</vh></v>
-<v t="aum.20060511001853"><vh>putdir</vh></v>
+<v t="aum.20060511001853" a="V"><vh>putdir</vh></v>
<v t="aum.20060521180804"><vh>invertprivate</vh></v>
</v>
<v t="aum.20060506224238" a="E"><vh>Other High Level Methods</vh>
@@ -285,7 +285,7 @@
<v t="aum.20060521111727.1"><vh>imports</vh></v>
<v t="aum.20060521131205"><vh>globals</vh></v>
<v t="aum.20060521131205.1"><vh>usage</vh></v>
-<v t="aum.20060521131205.2" a="V"><vh>help</vh></v>
+<v t="aum.20060521131205.2"><vh>help</vh></v>
<v t="aum.20060521111727.2"><vh>main</vh></v>
<v t="aum.20060521111727.3"><vh>mainline</vh></v>
</v>
@@ -1094,7 +1094,7 @@
opts['Global'] = "false"
opts['Verbosity'] = kw.get('verbosity', 0)
- opts['PriorityClass'] = kw.get('priority', 2)
+ opts['PriorityClass'] = kw.get('priority', 4)
if opts['Global'] == 'true' and opts['Persistence'] == 'connection':
raise Exception("Global requests must be persistent")
@@ -1333,7 +1333,7 @@
opts['Verbosity'] = kw.get('verbosity', 0)
opts['MaxRetries'] = kw.get("maxretries", 3)
- opts['PriorityClass'] = kw.get("priority", 2)
+ opts['PriorityClass'] = kw.get("priority", 4)
opts['GetCHKOnly'] = chkOnly
opts['DontCompress'] = toBool(kw.get("nocompress", "false"))
@@ -6746,7 +6746,7 @@
usk = kw.get('usk', False)
version = kw.get('version', 0)
maxretries = kw.get('maxretries', 3)
- priority = kw.get('priority', 2)
+ priority = kw.get('priority', 4)
verbosity = kw.get('verbosity', 0)
filebyfile = kw.get('filebyfile', False)
@@ -9110,7 +9110,7 @@
opts = {
"Verbosity" : 0,
"persistence" : "connection",
- "priority" : 2,
+ "priority" : 4,
}
# process command line switches
@@ -9288,7 +9288,7 @@
print " -g, --global"
print " Do it on the FCP global queue"
print " -r, --priority"
- print " Set the priority (0 highest, 6 lowest, default 2)"
+ print " Set the priority (0 highest, 6 lowest, default 4)"
print
print "Environment:"
print " Instead of specifying -H and/or -P, you can define the
environment"
@@ -9372,7 +9372,7 @@
print " -n, --nowait"
print " Don't wait for completion, exit immediately"
print " -r, --priority"
- print " Set the priority (0 highest, 6 lowest, default 2)"
+ print " Set the priority (0 highest, 6 lowest, default 4)"
print
print "Environment:"
print " Instead of specifying -H and/or -P, you can define the
environment"
@@ -9397,7 +9397,7 @@
"Verbosity" : 0,
"persistence" : "connection",
"async" : False,
- "priority" : 2,
+ "priority" : 4,
}
# process command line switches
Modified: trunk/apps/pyFreenet/fcp/node.py
===================================================================
--- trunk/apps/pyFreenet/fcp/node.py 2006-06-08 09:15:19 UTC (rev 9083)
+++ trunk/apps/pyFreenet/fcp/node.py 2006-06-08 09:23:40 UTC (rev 9084)
@@ -323,7 +323,7 @@
opts['Global'] = "false"
opts['Verbosity'] = kw.get('verbosity', 0)
- opts['PriorityClass'] = kw.get('priority', 2)
+ opts['PriorityClass'] = kw.get('priority', 4)
if opts['Global'] == 'true' and opts['Persistence'] == 'connection':
raise Exception("Global requests must be persistent")
@@ -472,7 +472,7 @@
opts['Verbosity'] = kw.get('verbosity', 0)
opts['MaxRetries'] = kw.get("maxretries", 3)
- opts['PriorityClass'] = kw.get("priority", 2)
+ opts['PriorityClass'] = kw.get("priority", 4)
opts['GetCHKOnly'] = chkOnly
opts['DontCompress'] = toBool(kw.get("nocompress", "false"))
@@ -562,7 +562,7 @@
usk = kw.get('usk', False)
version = kw.get('version', 0)
maxretries = kw.get('maxretries', 3)
- priority = kw.get('priority', 2)
+ priority = kw.get('priority', 4)
verbosity = kw.get('verbosity', 0)
filebyfile = kw.get('filebyfile', False)
Modified: trunk/apps/pyFreenet/fcpget
===================================================================
--- trunk/apps/pyFreenet/fcpget 2006-06-08 09:15:19 UTC (rev 9083)
+++ trunk/apps/pyFreenet/fcpget 2006-06-08 09:23:40 UTC (rev 9084)
@@ -52,7 +52,7 @@
print " -g, --global"
print " Do it on the FCP global queue"
print " -r, --priority"
- print " Set the priority (0 highest, 6 lowest, default 2)"
+ print " Set the priority (0 highest, 6 lowest, default 4)"
print
print "Environment:"
print " Instead of specifying -H and/or -P, you can define the
environment"
@@ -73,7 +73,7 @@
opts = {
"Verbosity" : 0,
"persistence" : "connection",
- "priority" : 2,
+ "priority" : 4,
}
# process command line switches
Modified: trunk/apps/pyFreenet/fcpget.py
===================================================================
--- trunk/apps/pyFreenet/fcpget.py 2006-06-08 09:15:19 UTC (rev 9083)
+++ trunk/apps/pyFreenet/fcpget.py 2006-06-08 09:23:40 UTC (rev 9084)
@@ -52,7 +52,7 @@
print " -g, --global"
print " Do it on the FCP global queue"
print " -r, --priority"
- print " Set the priority (0 highest, 6 lowest, default 2)"
+ print " Set the priority (0 highest, 6 lowest, default 4)"
print
print "Environment:"
print " Instead of specifying -H and/or -P, you can define the
environment"
@@ -73,7 +73,7 @@
opts = {
"Verbosity" : 0,
"persistence" : "connection",
- "priority" : 2,
+ "priority" : 4,
}
# process command line switches
Modified: trunk/apps/pyFreenet/fcpput
===================================================================
--- trunk/apps/pyFreenet/fcpput 2006-06-08 09:15:19 UTC (rev 9083)
+++ trunk/apps/pyFreenet/fcpput 2006-06-08 09:23:40 UTC (rev 9084)
@@ -57,7 +57,7 @@
print " -n, --nowait"
print " Don't wait for completion, exit immediately"
print " -r, --priority"
- print " Set the priority (0 highest, 6 lowest, default 2)"
+ print " Set the priority (0 highest, 6 lowest, default 4)"
print
print "Environment:"
print " Instead of specifying -H and/or -P, you can define the
environment"
@@ -81,7 +81,7 @@
"Verbosity" : 0,
"persistence" : "connection",
"async" : False,
- "priority" : 2,
+ "priority" : 4,
}
# process command line switches
Modified: trunk/apps/pyFreenet/fcpput.py
===================================================================
--- trunk/apps/pyFreenet/fcpput.py 2006-06-08 09:15:19 UTC (rev 9083)
+++ trunk/apps/pyFreenet/fcpput.py 2006-06-08 09:23:40 UTC (rev 9084)
@@ -57,7 +57,7 @@
print " -n, --nowait"
print " Don't wait for completion, exit immediately"
print " -r, --priority"
- print " Set the priority (0 highest, 6 lowest, default 2)"
+ print " Set the priority (0 highest, 6 lowest, default 4)"
print
print "Environment:"
print " Instead of specifying -H and/or -P, you can define the
environment"
@@ -81,7 +81,7 @@
"Verbosity" : 0,
"persistence" : "connection",
"async" : False,
- "priority" : 2,
+ "priority" : 4,
}
# process command line switches
Modified: trunk/apps/pyFreenet/manpages/fcpget.1
===================================================================
--- trunk/apps/pyFreenet/manpages/fcpget.1 2006-06-08 09:15:19 UTC (rev
9083)
+++ trunk/apps/pyFreenet/manpages/fcpget.1 2006-06-08 09:23:40 UTC (rev
9084)
@@ -21,15 +21,18 @@
to the stderr stream.
.TP
-\fB\-H\fR, \fB\-\-fcpHost=<hostname>\fR
-Use FCP interface at host <hostname>,
+\fB\-H\fR, \fB\-\-fcpHost=\fIhostname\fR
+Use FCP interface at host \fIhostname\fR,
defaults to 127.0.0.1
.TP
-\fB\-P\fR, \fB\-\-fcpPort=<port>\fR
-Use FCP interface at port <port>
+\fB\-P\fR, \fB\-\-fcpPort=\fIport\fR
+Use FCP interface at port \fIport\fR
.TP
+\fB\-r\fR, \fB\-\-priority=\fIpriority\fR
+Sets priority to \fIpriority\fR. Valid values are
+0 (highest) to 6 (lowest). Default is 4.
.LP
Modified: trunk/apps/pyFreenet/manpages/fcpget.1.html
===================================================================
--- trunk/apps/pyFreenet/manpages/fcpget.1.html 2006-06-08 09:15:19 UTC (rev
9083)
+++ trunk/apps/pyFreenet/manpages/fcpget.1.html 2006-06-08 09:23:40 UTC (rev
9084)
@@ -39,13 +39,16 @@
Enable very verbose output, including FCP transcripts,
to the stderr stream.
<DT><DD>
-<B>-H</B>, <B>--fcpHost=<hostname></B>
-Use FCP interface at host <hostname>,
+<B>-H</B>, <B>--fcpHost=</B><I>hostname</I>
+Use FCP interface at host <I>hostname</I>,
defaults to 127.0.0.1
<DT><DD>
-<B>-P</B>, <B>--fcpPort=<port></B>
-Use FCP interface at port <port>
+<B>-P</B>, <B>--fcpPort=</B><I>port</I>
+Use FCP interface at port <I>port</I>
<DT><DD>
+<B>-r</B>, <B>--priority=</B><I>priority</I>
+Sets priority to <I>priority</I>. Valid values are
+0 (highest) to 6 (lowest). Default is 4.
<P>
</DL>
<P>
@@ -122,6 +125,6 @@
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 01:47:06 GMT, May 28, 2006
+Time: 09:21:27 GMT, June 08, 2006
</BODY>
</HTML>
Modified: trunk/apps/pyFreenet/manpages/fcpput.1
===================================================================
--- trunk/apps/pyFreenet/manpages/fcpput.1 2006-06-08 09:15:19 UTC (rev
9083)
+++ trunk/apps/pyFreenet/manpages/fcpput.1 2006-06-08 09:23:40 UTC (rev
9084)
@@ -41,7 +41,12 @@
(if present), or from a 'file extension' suffix on
the URI. If neither of these are present, default
mimetype is text/plain.
+.TP
+\fB\-r\fR, \fB\-\-priority=\fIpriority\fR
+Sets priority to \fIpriority\fR. Valid values are
+0 (highest) to 6 (lowest). Default is 4.
+
.LP
.SH "FILES"
Modified: trunk/apps/pyFreenet/manpages/fcpput.1.html
===================================================================
--- trunk/apps/pyFreenet/manpages/fcpput.1.html 2006-06-08 09:15:19 UTC (rev
9083)
+++ trunk/apps/pyFreenet/manpages/fcpput.1.html 2006-06-08 09:23:40 UTC (rev
9084)
@@ -57,6 +57,10 @@
(if present), or from a 'file extension' suffix on
the URI. If neither of these are present, default
mimetype is text/plain.
+<DT><DD>
+<B>-r</B>, <B>--priority=</B><I>priority</I>
+Sets priority to <I>priority</I>. Valid values are
+0 (highest) to 6 (lowest). Default is 4.
<P>
</DL>
<P>
@@ -137,6 +141,6 @@
This document was created by
<A HREF="/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 01:47:06 GMT, May 28, 2006
+Time: 09:21:35 GMT, June 08, 2006
</BODY>
</HTML>
