config: introduce 'daemon_host" and 'daemon_port' parameters

CrashFix · Jun 27, 2018 · db05952 · db05952
1 parent 910cfdf
commit db05952
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 55 deletions.
diff --git a/protected/components/Daemon.php b/protected/components/Daemon.php
@@ -5,9 +5,9 @@
  */
 class Daemon extends CApplicationComponent
 {
-	public $host;        // Service host.
-	public $servicePort; // Service port.
-	public $errorMsg;    // Error message.
+	public $host;     // Service host.
+	public $port;     // Service port.
+	public $errorMsg; // Error message.
 
     const DAEMON_CHECK_OK                = 0; // Daemon check OK.
     const DAEMON_CHECK_INACTIVE          = 1; // Daemon seems to be inactive or not responding.
@@ -304,12 +304,12 @@ private function sendRequest($request, &$responce)
 		} 
 
 		// Connect socket	
-		$result = @socket_connect($sock, '127.0.0.1', '50');
+		$result = @socket_connect($sock, $this->host, $this->port);
 		if( FALSE === $result ) 
 		{
-			$responce = "Error connecting to daemon.";
+			$responce = "Error connecting to daemon ".$this->host.":".$this->port;
 			return -1;
-		}		
+		}
 
 		// Read greeting message from daemon
 		$responce = socket_read($sock, 128);

diff --git a/protected/config/common.php b/protected/config/common.php
@@ -12,6 +12,19 @@ function getCommonParams()
 
 }
 
+/**
+ * 
+ */
+function daemonParams()
+{
+	$userParams = parse_ini_file(dirname(__FILE__).DIRECTORY_SEPARATOR.'user_params.ini');
+
+	return array(		
+            'class'=>'Daemon',			
+            'host'=>$userParams['daemon_host'],    
+            'port'=>$userParams['daemon_port'],    
+        );
+}
 
 /**
  * This helper function is used for extracting db connection parameters from INI

diff --git a/protected/config/console.php b/protected/config/console.php
@@ -23,11 +23,7 @@
 		'db'=>dbParams(),		
 		'dbTest'=>dbParams('test_'),
 
-		'daemon'=>array(
-			'class'=>'Daemon',
-			'host'=>'127.0.0.1',
-			'servicePort'=>'50',
-		),		
+		'daemon'=> daemonParams(),
 
 		'log'=>array(
 			'class'=>'CLogRouter',

diff --git a/protected/config/main.php b/protected/config/main.php
@@ -62,11 +62,7 @@
             'connectionID' => 'db',
             'sessionTableName' => '{{YiiSession}}'
         ),
-        'daemon' => array(
-            'class' => 'Daemon',
-            'host' => '127.0.0.1',
-            'servicePort' => '50',
-        ),
+        'daemon' => daemonParams(),
         'errorHandler' => array(
             // use 'site/error' action to display errors
             'errorAction' => 'site/error',

diff --git a/protected/config/user_params.ini b/protected/config/user_params.ini
diff --git a/protected/config/user_params.ini.template b/protected/config/user_params.ini.template
@@ -33,5 +33,4 @@ db_password=crashfixpwd
 ; so on.
 db_table_prefix=tbl_ 
 
-
-
+daemon_port=50