malawi_hiv_program_reports 1.1.17 → 1.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c818eb00df67da231594873c08c20bb5df18a2c53433788a96e27a7ca1211bf9
-  data.tar.gz: fd99e8c2ca139a33ddd76a9eefbaef20dfcf6eee7c1b6290919e2240c39b9c63
+  metadata.gz: 22a3e944fcb8f4a9e0d862b50321ead38c607a3488c002096735853b06922be5
+  data.tar.gz: fb58caba60b6795e915efaadd08fea81e2817129ef500843da95ba48047028aa
 SHA512:
-  metadata.gz: f61982a9e3ce30521079abacdd89144d6c03d10fde293d5fbefcb61fac57a143e5680f5216eee22e8423f37d8b88014205f602003af0644a7a95078fed7d052c
-  data.tar.gz: ea196faf6b0a471e995e4885058acbc0a141c7fcbe948e502801648ed796fbea5e72bf1d0f28b556ea0ccd1404cbc78046928ebb5330acdcfd7068f54f16c924
+  metadata.gz: 91ae6c317a44e67d502cc97f3d3d72d54ace89d8def8326f8fc2ea7901e1b4693c0754084b33a1bf9c9d32626dd840b72df1e1c56ee558547ed0ff5056756403
+  data.tar.gz: 8d52d72581ab43cc207e34bbb20ecf62d942cd104c854e0890c4b1712346d64a609907cd447c9f912298be40b78d0affd36e4be1a8ef123a86f7fd749258a83b

data/app/services/malawi_hiv_program_reports/moh/cumulative_cohort.rb

@@ -23,10 +23,7 @@ module MalawiHivProgramReports
         @definition = kwargs[:definition] || 'pepfar'
         @iteration = Concurrent::AtomicFixnum.new(0)
         @start_time = Time.now
-        @redis = Redis.new
-        @redis.set('cumulative_progress', 0)
-        @redis.set('cumulative_status', 'running')
-        @redis.set('cumulative_time_taken', 0)
+        prepare_redis
         definition = @definition.downcase
         raise ArgumentError, "Invalid outcomes definition: #{definition}" unless %w[moh pepfar].include?(definition)
       end
@@ -61,7 +58,7 @@ module MalawiHivProgramReports
         queue = Queue.new
         locations.each { |loc| queue << loc }
 
-        threads = Array.new(65) do
+        threads = Array.new(configured_threads) do
           Thread.new do
             until queue.empty?
               loc = begin
@@ -74,7 +71,7 @@ module MalawiHivProgramReports
               ActiveRecord::Base.connection_pool.with_connection do
                 process_data loc
                 current_iteration = iteration.increment
-                # update_progress(current_iteration, locations.size)
+                update_progress(current_iteration, locations.size)
               rescue StandardError => e
                 Rails.logger.info("Error processing location #{loc}: #{e.message}")
                 Rails.logger.info(e.backtrace.join("\n"))
@@ -88,6 +85,22 @@ module MalawiHivProgramReports
       end
       # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
+      def configured_threads
+        threads = ::Utils::ConfigReader.application_read('max_threads')&.to_i
+        Rails::logger.info("Max threads: #{threads}")
+        threads.positive? ? threads : 60
+      rescue StandardError => e
+        Rails.logger.info("Error reading max threads: #{e.message}")
+        60
+      end
+
+      def prepare_redis
+        @redis = Redis.new
+        @redis.set('cumulative_progress', 0)
+        @redis.set('cumulative_status', 'running')
+        @redis.set('cumulative_time_taken', 0)
+      end
+
       # update progress in redis and channel
       def update_progress(current_iteration, total)
         percentage = (current_iteration.to_f / total * 100).round(2)

data/lib/malawi_hiv_program_reports/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MalawiHivProgramReports
-  VERSION = '1.1.17'
+  VERSION = '1.1.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malawi_hiv_program_reports
 version: !ruby/object:Gem::Version
-  version: 1.1.17
+  version: 1.1.18
 platform: ruby
 authors:
 - Roy Chanunkha
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-25 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Malawi HIV PROGRAM Reports for Ruby on Rails