content_server 1.2.0 → 1.2.1

data/lib/content_data/content_data.rb

@@ -241,18 +241,15 @@ module ContentData
       return_str = ""
       contents_str = ""
       instances_str = ""
-      instances_counter = 0
       each_content { |checksum, size, content_mod_time|
         contents_str << "%s,%d,%d\n" % [checksum, size, content_mod_time]
       }
-      instances_counter = 0
       each_instance { |checksum, size, content_mod_time, instance_mod_time, server, path|
-        instances_counter += 1
         instances_str <<  "%s,%d,%s,%s,%d\n" % [checksum, size, server, path, instance_mod_time]
       }
       return_str << "%d\n" % [@contents_info.length]
       return_str << contents_str
-      return_str << "%d\n" % [instances_counter]
+      return_str << "%d\n" % [@instances_info.length]
       return_str << instances_str
       return_str
     end
@@ -260,7 +257,16 @@ module ContentData
     def to_file(filename)
       content_data_dir = File.dirname(filename)
       FileUtils.makedirs(content_data_dir) unless File.directory?(content_data_dir)
-      File.open(filename, 'w') {|f| f.write(to_s) }
+      file = File.open(filename, 'w')
+      file.write("#{@contents_info.length}\n")
+      each_content { |checksum, size, content_mod_time|
+        file.write("#{checksum},#{size},#{content_mod_time}\n")
+      }
+      file.write("#{@instances_info.length}\n")
+      each_instance { |checksum, size, _, instance_mod_time, server, path|
+        file.write("#{checksum},#{size},#{server},#{path},#{instance_mod_time}\n")
+      }
+      file.close
     end
 
     # TODO validation that file indeed contains ContentData missing

data/lib/content_server/backup_server.rb

@@ -97,7 +97,7 @@ module ContentServer
       loop{
         sleep(Params['data_flush_delay'])
         Log.info('Start flush local content data to file.')
-        $testing_memory_log.info('Start flush content data to file') if $testing_memory_log
+        $testing_memory_log.info('Start flush content data to file') if $testing_memory_active
         written_to_file = false
         $local_content_data_lock.synchronize{
           local_content_data_unique_id = $local_content_data.unique_id
@@ -106,11 +106,11 @@ module ContentServer
             $local_content_data.to_file($tmp_content_data_file)
             written_to_file = true
           else
-            Log.debug1('no need to flush. content data has not changed')
+            Log.info('no need to flush. content data has not changed')
           end
         }
         File.rename($tmp_content_data_file, Params['local_content_data_path']) if written_to_file
-        $testing_memory_log.info("End flush content data to file") if $testing_memory_log
+        $testing_memory_log.info("End flush content data to file") if $testing_memory_active
       }
     end
 

data/lib/content_server/version.rb

@@ -1,3 +1,3 @@
   module ContentServer
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end

data/lib/testing_memory/testing_memory.rb

@@ -123,7 +123,8 @@ module TestingMemory
       email_report += generate_mem_report
       email_report += "indexed files:#{$indexed_file_count}\n"
       $testing_memory_log.info("indexed files:#{$indexed_file_count}")
-      puts "indexed files:#{$indexed_file_count}"
+      puts("indexed files:#{$indexed_file_count}")
+      #puts("symobles size:#{Symbol.all_symbols.size}")
       if total_files == $indexed_file_count
         stop_time = Time.now
         email_report += "\nAt this point all files are indexed. No mem changes should occur\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: content_server
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-03 00:00:00.000000000 Z
+date: 2013-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake