manage the number of threads using tpoics #3566

Author: shroffk

services/alarm-logger/src/main/java/org/phoebus/alarm/logging/AlarmLoggingService.java

@@ -228,20 +228,6 @@ else if (cmd.equals("-logging"))
                     iter.remove();
                     LogManager.getLogManager().readConfiguration(new FileInputStream(filename));
                 }
-                else if(cmd.equals("-thread_pool_size")){
-                    if (! iter.hasNext()){
-                        throw new Exception("Missing -thread_pool_size value");
-                    }
-                    iter.remove();
-                    try {
-                        String size = iter.next();
-                        Integer threadPoolSize = Integer.valueOf(size);
-                        properties.put("thread_pool_size", size);
-                    } catch (NumberFormatException e) {
-                        logger.warning("Specified thread pool size is not a number, will use value from properties or default value");
-                    }
-                    iter.remove();
-                }
                 else
                     throw new Exception("Unknown option " + cmd);
             }
@@ -257,23 +243,17 @@ else if(cmd.equals("-thread_pool_size")){
         logger.info("Alarm Logging Service (PID " + ProcessHandle.current().pid() + ")");
         context = SpringApplication.run(AlarmLoggingService.class, original_args);
 
-        // Create scheduler with configured or default thread pool size
-        Integer threadPoolSize;
-        try {
-            threadPoolSize = Integer.valueOf(properties.getProperty("thread_pool_size"));
-        } catch (NumberFormatException e) {
-            logger.info("Specified thread pool size is not a number, will default to 4");
-            threadPoolSize = 4;
-        }
-        Scheduler = Executors.newScheduledThreadPool(threadPoolSize);
-
         logger.info("Properties:");
         properties.forEach((k, v) -> { logger.info(k + ":" + v); });
 
         // Read list of Topics
         final List<String> topicNames = Arrays.asList(properties.getProperty("alarm_topics").split(","));
         logger.info("Starting logger for '..State': " + topicNames);
 
+        // Create scheduler with configured or default thread pool size
+        int threadPoolSize = topicNames.size() * 2; // default to 2 threads per topic
+        Scheduler = Executors.newScheduledThreadPool(threadPoolSize);
+
         final boolean standalone = Boolean.valueOf(properties.getProperty("standalone"));
 
         // If the standalone is true, ignore the Schedulers for AlarmMessageLogger and AlarmCmdLogger

services/alarm-logger/src/main/resources/application.properties

@@ -48,9 +48,6 @@ use_dated_index_names=true
 # The units of the indices date span: Days (D), Weeks(W), Months(M), Years(Y).
 date_span_units=M
 
-# Size of the thread pool for message and command loggers. Two threads per topic/configuration are required
-thread_pool_size=4
-
 # Standalone - Alarm Logger Service
 standalone=false