Skip to content

Commit 599ac45

Browse files
committed
update-bookmarks: reconnect on each get
A failed ClientGet requires reconnecting: CLIENT: ClientHello CLIENT: ExpectedVersion=2.0 CLIENT: Name=id2737953073202801 CLIENT: EndMessage NODE: ---------------------------- NODE: NodeHello NODE: CompressionCodecs=4 - GZIP(0), BZIP2(1), LZMA(2), LZMA_NEW(3) NODE: Testnet=false NODE: NodeLanguage=ENGLISH NODE: ExtRevision=v29 NODE: Node=Fred NODE: Build=1472 NODE: FCPVersion=2.0 NODE: ConnectionIdentifier=19f97a9d5b55e7af6a30641bff3a2d70 NODE: Revision=build01472 NODE: Version=Fred,0.7,1.0,1472 NODE: ExtBuild=29 NODE: EndMessage Fetching USK@XJZAi25dd5y7lrxE3cHMmM-xZ-c-hlPpKLYeLC0YG5I,8XTbR1bd9RBXlX6j-OZNednsJ8Cl6EAeBBebC3jtMFU,AQACAAE/index/625/ FCPNode: manager thread starting get: uri=USK@XJZAi25dd5y7lrxE3cHMmM-xZ-c-hlPpKLYeLC0YG5I,8XTbR1bd9RBXlX6j-OZNednsJ8Cl6EAeBBebC3jtMFU,AQACAAE/index/625/ get: kw={'nodata': True} Waiting on job CLIENT: ClientGet CLIENT: IgnoreDS=false CLIENT: Verbosity=0 CLIENT: Global=false CLIENT: URI=USK@XJZAi25dd5y7lrxE3cHMmM-xZ-c-hlPpKLYeLC0YG5I,8XTbR1bd9RBXlX6j-OZNednsJ8Cl6EAeBBebC3jtMFU,AQACAAE/index/625/ CLIENT: MaxSize=1000000000000 CLIENT: DSOnly=false CLIENT: ReturnType=none CLIENT: MaxRetries=-1 CLIENT: Identifier=id2500322042658190 CLIENT: PriorityClass=2 CLIENT: Persistence=connection CLIENT: EndMessage NODE: ---------------------------- NODE: GetFailed NODE: Fatal=true NODE: CodeDescription=Permanent redirect: use the new URI NODE: RedirectURI=USK@XJZAi25dd5y7lrxE3cHMmM-xZ-c-hlPpKLYeLC0YG5I,8XTbR1bd9RBXlX6j-OZNednsJ8Cl6EAeBBebC3jtMFU,AQACAAE/index/684/ NODE: Identifier=id2500322042658190 NODE: Code=27 NODE: ShortCodeDescription=New URI NODE: EndMessage shutdown: entered _mgrThread: Manager thread terminated normally shutdown: waiting for manager thread to terminate shutdown: manager thread terminated shutdown: done?
1 parent ded47f6 commit 599ac45

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

update-bookmarks.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
# https://wiki.freenetproject.org/FCPv2/GetFailed#Fetch_Error_Codes
1919
REDIRECT = 27
2020

21-
node = fcp.node.FCPNode(host=args.host, port=args.port)
22-
2321
with open(args.path) as bookmark_file:
2422
bookmarks = bookmark_file.readlines()
2523

@@ -28,6 +26,7 @@
2826
if line and line != "End\n":
2927
key, value = line.split("=", 1)
3028
if key.endswith("URI"):
29+
node = fcp.node.FCPNode(host=args.host, port=args.port)
3130
try:
3231
# readlines() lines end with a newline.
3332
uri = value.rstrip()

0 commit comments

Comments
 (0)