cache_tokens updated (debug and memory limit)

ArtemKo7v · ArtemKo7v · commit 7d4da6c987c6 · 2018-07-25T16:55:38.000+07:00
diff --git a/bin/cache_tokens.php b/bin/cache_tokens.php
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-ini_set('memory_limit', '512M');
+ini_set('memory_limit', '1G');
 
 // define('ETHPLORER_SHOW_OUTPUT', 1);
 
diff --git a/service/lib/ethplorer.php b/service/lib/ethplorer.php
@@ -1000,9 +1000,7 @@ public function getTokens($updateCache = false){
                 unset($aToken["_id"]);
                 $aResult[$address] = $aToken;
                 if(!isset($aPrevTokens[$address]) || ($aPrevTokens[$address]['transfersCount'] < $aToken['transfersCount'])){
-                    if(defined('ETHPLORER_SHOW_OUTPUT')){
-                        echo $address . " was recently updated (transfers count = " . $aToken['transfersCount'] . ")\n";
-                    }
+                    $this->_cliDebug($address . " was recently updated (transfers count = " . $aToken['transfersCount'] . ")");
                     $aResult[$address]['issuancesCount'] = $this->getContractOperationCount(array('$in' => array('issuance', 'burn', 'mint')), $address, FALSE);
                     $hc = $this->getTokenHoldersCount($address);;
                     if(FALSE !== $hc){
@@ -3325,7 +3323,8 @@ protected function getEthToken(){
     }
 
     protected function _cliDebug($message){
-        if(isset($this->aSettings['cliDebug']) && $this->aSettings['cliDebug'] && (php_sapi_name() === 'cli')){
+        $showDebug = ((isset($this->aSettings['cliDebug']) && $this->aSettings['cliDebug']) || defined('ETHPLORER_SHOW_OUTPUT')) && (php_sapi_name() === 'cli');
+        if($showDebug){
             echo '[' . date("Y-m-d H:i:s") . '] ' . $message . "\n";
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1000,9 +1000,7 @@ public function getTokens($updateCache = false){`
`1000`	`1000`	`unset($aToken["_id"]);`
`1001`	`1001`	`$aResult[$address] = $aToken;`
`1002`	`1002`	`if(!isset($aPrevTokens[$address]) \|\| ($aPrevTokens[$address]['transfersCount'] < $aToken['transfersCount'])){`
`1003`		`- if(defined('ETHPLORER_SHOW_OUTPUT')){`
`1004`		`- echo $address . " was recently updated (transfers count = " . $aToken['transfersCount'] . ")\n";`
`1005`		`- }`
	`1003`	`+ $this->_cliDebug($address . " was recently updated (transfers count = " . $aToken['transfersCount'] . ")");`
`1006`	`1004`	`$aResult[$address]['issuancesCount'] = $this->getContractOperationCount(array('$in' => array('issuance', 'burn', 'mint')), $address, FALSE);`
`1007`	`1005`	`$hc = $this->getTokenHoldersCount($address);;`
`1008`	`1006`	`if(FALSE !== $hc){`
`@@ -3325,7 +3323,8 @@ protected function getEthToken(){`
`3325`	`3323`	`}`
`3326`	`3324`
`3327`	`3325`	`protected function _cliDebug($message){`
`3328`		`- if(isset($this->aSettings['cliDebug']) && $this->aSettings['cliDebug'] && (php_sapi_name() === 'cli')){`
	`3326`	`+ $showDebug = ((isset($this->aSettings['cliDebug']) && $this->aSettings['cliDebug']) \|\| defined('ETHPLORER_SHOW_OUTPUT')) && (php_sapi_name() === 'cli');`
	`3327`	`+ if($showDebug){`
`3329`	`3328`	`echo '[' . date("Y-m-d H:i:s") . '] ' . $message . "\n";`
`3330`	`3329`	`}`
`3331`	`3330`	`}`