DEFAULT_CONFIG_POLL_INTERVAL constant

Author: vrza

bin/lrpm

@@ -35,22 +35,19 @@ if (count($rest) < 1) {
 
 $configSourceClass = $rest[0];
 
-$interval = array_key_exists('interval', $options) ? intval($options['interval'])
-          : (array_key_exists('i', $options) ? intval($options['i'])
-          : 0);
-
 probeForAutoloader($progname);
 
 if (!class_exists($configSourceClass)) {
     fwrite(STDERR, "Cannot find class: $configSourceClass" . PHP_EOL);
     exit(EXIT_CONFIG_SOURCE_CLASS_NOT_FOUND);
 }
 
+use PHPLRPM\ConfigurationProcess;
 use PHPLRPM\ProcessManager;
 
-$processManager = $interval > 0
-                ? new ProcessManager($configSourceClass, $interval)
-                : new ProcessManager($configSourceClass);
+$interval = intval($options['interval'] ?? $options['i'] ?? ConfigurationProcess::DEFAULT_CONFIG_POLL_INTERVAL);
+
+$processManager = new ProcessManager($configSourceClass, $interval);
 $processManager->run();
 
 function probeForAutoloader($programName): void

src/ConfigurationProcess.php

@@ -10,7 +10,7 @@
 
 class ConfigurationProcess
 {
-    public const SOCKET_FILE_NAME = 'config';
+    public const DEFAULT_CONFIG_POLL_INTERVAL = 30;
 
     private const CONFIG_POLL_TIME_INIT = 0;
 
@@ -24,7 +24,7 @@ class ConfigurationProcess
     public function findConfigSocket()
     {
         $this->configSocket = FileSystemUtils::findWritableFilePath(
-            self::SOCKET_FILE_NAME,
+            MessageService::CONFIG_SOCKET_FILE_NAME,
             IPCUtilities::getSocketDirs()
         );
         if (is_null($this->configSocket)) {
@@ -67,7 +67,9 @@ public function runConfigurationProcessLoop($supervisorPid)
                     fwrite(STDERR, '--> Could not send config to supervisor: ' . $e->getMessage() . PHP_EOL);
                 }
             }
-            sleep($this->configPollIntervalSeconds);
+            if ($this->configPollIntervalSeconds > 0) {
+                sleep($this->configPollIntervalSeconds);
+            }
             pcntl_signal_dispatch();
         }
     }

src/ProcessManager.php

@@ -26,7 +26,7 @@ class ProcessManager
     private $controlMessageHandler;
     private $messageService;
 
-    public function __construct(string $configurationSourceClass, int $configPollIntervalSeconds = 30)
+    public function __construct(string $configurationSourceClass, int $configPollIntervalSeconds = ConfigurationProcess::DEFAULT_CONFIG_POLL_INTERVAL)
     {
         fwrite(STDERR, '==> lrpm starting' . PHP_EOL);
         $this->configPollIntervalSeconds = $configPollIntervalSeconds;