Better log

Author: eldy

class/sellyoursaasutils.class.php

@@ -4266,7 +4266,7 @@ public function sellyoursaasRemoteAction($remoteaction, $object, $appusername =
 				dol_syslog("List of lines contains an empty ContratLine, we discard this line.", LOG_WARNING);
 				continue;
 			}
-			dol_syslog("** Process contract line id=".$tmpobject->id." to know which action to do");
+			dol_syslog("** Process contract line id=".$tmpobject->id." to know which action to do and define remoteaction to 0, 1 (most action like deploy, deployoption, rename, ...) or 2 (refesh)");
 
 			$producttmp = new Product($this->db);
 			$producttmp->fetch($tmpobject->fk_product, '', '', '', 1, 1, 1);
@@ -4301,7 +4301,13 @@ public function sellyoursaasRemoteAction($remoteaction, $object, $appusername =
 
 		$listoflinesqualified = dol_sort_array($listoflinesqualified, 'position', 'asc');
 
-		// Now loop on each lines qualified for action
+
+		$tmp = explode('.', $contract->ref_customer, 2);
+		$sldAndSubdomain = $tmp[0];
+		$domainname = $tmp[1];
+
+		
+		// Now loop on each lines qualified for action and call remote URL
 		foreach ($listoflinesqualified as $tmparrayoflinesqualified) {
 			$tmpobject = $tmparrayoflinesqualified['tmpobject'];
 			$doremoteaction = $tmparrayoflinesqualified['doremoteaction'];
@@ -4325,10 +4331,7 @@ public function sellyoursaasRemoteAction($remoteaction, $object, $appusername =
 				}
 
 				$ispaidinstance = sellyoursaasIsPaidInstance($contract);
-
-				$tmp=explode('.', $contract->ref_customer, 2);
-				$sldAndSubdomain=$tmp[0];
-				$domainname=$tmp[1];
+				
 				if (! empty($contract->array_options['options_deployment_host'])) {
 					$serverdeployment = $contract->array_options['options_deployment_host'];
 				} else {
@@ -4484,14 +4487,14 @@ public function sellyoursaasRemoteAction($remoteaction, $object, $appusername =
 				}
 				$substitarray['__SMTP_SPF_STRING__'] = '_spf'.$sldAndSubdomain.'.'.$domainname;
 
-
+				
 				$dirfortmpfiles = DOL_DATA_ROOT.'/sellyoursaas/temp';
 				dol_mkdir($dirfortmpfiles, '', '0775');
 				$tmppackage->srcconffile1 = $dirfortmpfiles.'/conf.php.'.$sldAndSubdomain.'.'.$domainname.'.tmp';
 				$tmppackage->srccronfile  = $dirfortmpfiles.'/cron.'.$sldAndSubdomain.'.'.$domainname.'.tmp';
 				$tmppackage->srccliafter  = $dirfortmpfiles.'/cliafter.'.$sldAndSubdomain.'.'.$domainname.'.tmp';
 				$tmppackage->srccliafterpaid  = $dirfortmpfiles.'/cliafterpaid.'.$sldAndSubdomain.'.'.$domainname.'.tmp';
-
+				
 				$conffile = make_substitutions($tmppackage->conffile1, $substitarray);
 				$cronfile = make_substitutions($tmppackage->crontoadd, $substitarray);
 				$cliafter = make_substitutions($tmppackage->cliafter, $substitarray);
@@ -4543,21 +4546,25 @@ public function sellyoursaasRemoteAction($remoteaction, $object, $appusername =
 					}
 
 					if ($tmppackage->srccliafter && $cliafter) {
-						dol_syslog("Create cli file ".$tmppackage->srccliafter);
+						dol_syslog("Create cli after file ".$tmppackage->srccliafter);
+
 						dol_delete_file($tmppackage->srccliafter, 0, 1, 0, null, false, 0);
+
 						$result = file_put_contents($tmppackage->srccliafter, str_replace("\r", '', $cliafter));
 						@chmod($tmppackage->srccliafter, 0664);  // so user/group has "rw" ('admin' can delete if owner/group is 'admin' or 'www-data', 'root' can also read using nfs)
 					} else {
-						dol_syslog("No cli file to create or no content");
+						dol_syslog("No cli adter file to create or no content");
 					}
 
 					if ($tmppackage->cliafterpaid && $cliafterpaid) {
-						dol_syslog("Create cli file ".$tmppackage->srccliafter);
+						dol_syslog("Create cli afterpaid file ".$tmppackage->srccliafterpaid);
+
 						dol_delete_file($tmppackage->srccliafterpaid, 0, 1, 0, null, false, 0);
+
 						$result = file_put_contents($tmppackage->srccliafterpaid, str_replace("\r", '', $cliafterpaid));
 						@chmod($tmppackage->srccliafterpaid, 0664);  // so user/group has "rw" ('admin' can delete if owner/group is 'admin' or 'www-data', 'root' can also read using nfs)
 					} else {
-						dol_syslog("No cli after paid file to create or no content");
+						dol_syslog("No cli afterpaid file to create or no content");
 					}
 				}
 				if (in_array($remoteaction, array("deploy", "deployall"))) {
@@ -4692,10 +4699,6 @@ public function sellyoursaasRemoteAction($remoteaction, $object, $appusername =
 				if (! empty($producttmp->array_options['options_resource_formula'])) {
 					$targetdir = getDolGlobalString('DOLICLOUD_INSTANCES_PATH');
 
-					$tmp=explode('.', $contract->ref_customer, 2);
-					$sldAndSubdomain=$tmp[0];
-					$domainname=$tmp[1];
-
 					$generatedunixlogin   = $contract->array_options['options_username_os'];
 					$generatedunixpassword= $contract->array_options['options_password_os'];
 					$generateddbname      = $contract->array_options['options_database_db'];

scripts/remote_server/index.php

@@ -102,9 +102,9 @@
 $return_var=0;
 
 if ($DEBUG) {
-	fwrite($fh, "\n".date('Y-m-d H:i:s').' >>>>>>>>>>>>>>>>>>>> Call for action '.$tmparray[0].' by '.$_SERVER['REMOTE_ADDR'].' URI='.$_SERVER['REQUEST_URI']."\n");
+	fwrite($fh, "\n".date('Y-m-d H:i:s').' >>>>>>>>>>>>>>>>>>>> index.php Call for action '.$tmparray[0].' by '.$_SERVER['REMOTE_ADDR'].' URI='.$_SERVER['REQUEST_URI']."\n");
 } else {
-	fwrite($fh, "\n".date('Y-m-d H:i:s').' >>>>>>>>>>>>>>>>>>>> Call for action '.$tmparray[0]." by ".$_SERVER['REMOTE_ADDR']."\n");
+	fwrite($fh, "\n".date('Y-m-d H:i:s').' >>>>>>>>>>>>>>>>>>>> index.php Call for action '.$tmparray[0]." by ".$_SERVER['REMOTE_ADDR']."\n");
 }
 
 fwrite($fh, date('Y-m-d H:i:s').' dnsserver='.$dnsserver.", instanceserver=".$instanceserver.", allowed_hosts=".$allowed_hosts."\n");