new fortune, pushed file expiration date further out for recursive copier.

that expiration is for synch-based transfers, and maybe that's a sign we need to move
it out of the lower level file copying support.

diff --git a/database/fortunes.dat b/database/fortunes.dat
index d2b87fb6a46ea7e5d773adfa550a6f8ae8238c62..385f11e540a12db7b77ff0b135acc90c3eb7f53f 100644 (file)
--- a/database/fortunes.dat
+++ b/database/fortunes.dat
@@ -37929,3 +37929,15 @@ what is an inference?
   someone says, "my hand stinks because my butt stinks."
 an inference you could draw:
   that hand has probably been too close to that butt.
+~
+What Do We Mean by Bodhisattva?
+
+  Bodhi means enlightenment, the state devoid of all defects and endowed with
+all good qualities.  Sattva refers to someone who has courage and confidence
+and who strives to attain enlightenment for the sake of all beings.  Those who
+have this spontaneous, sincere wish to attain enlightenment for the ultimate
+benefit of all beings are called bodhisattvas.  Through wisdom, they direct
+their minds to enlightenment, and through their compassion, they have concern
+for beings.  This wish for perfect enlightenment for the sake of others is
+what we call bodhichitta, and it is the starting point on the path.
+

diff --git a/octopi/library/tentacles/recursive_file_copy.cpp b/octopi/library/tentacles/recursive_file_copy.cpp
index 40e4f0afa62fbd93f3a6aac69f6e5d8256ab5622..8464ed4e073583f097ad2ced86e9921e735095a1 100644 (file)
--- a/octopi/library/tentacles/recursive_file_copy.cpp
+++ b/octopi/library/tentacles/recursive_file_copy.cpp
@@ -49,6 +49,11 @@ namespace octopi {
 const int MAX_CHUNK_RFC_COPY_HIER = 1 * MEGABYTE;
   // maximum size for each transfer chunk.
 
+const int EXPECTED_MAXIMUM_TRANSFER_TIME = 10 * HOUR_ms;
+  // how long do we allow the scanned file lists to stay relevant.
+  // we allow it a long time, since this is a copy and not an active
+  // synchronization.
+
 recursive_file_copy::~recursive_file_copy() {}
 
 const char *recursive_file_copy::outcome_name(const outcome &to_name)
@@ -85,7 +90,7 @@ outcome recursive_file_copy::copy_hierarchy(int transfer_mode,
   ring_leader.add_tentacle(tran);
 
   outcome add_ret = tran->add_correspondence("snootums", source_dir,
-      10 * MINUTE_ms);
+      EXPECTED_MAXIMUM_TRANSFER_TIME);
   if (add_ret != tentacle::OKAY)
     RETURN_ERROR_RFC("failed to add the correspondence", NOT_FOUND);