|
@@ -337,7 +337,7 @@ class chctl
|
|
|
$state = 'profit';
|
|
|
}
|
|
|
|
|
|
- Log::record("auto_match channel {$name} state={$state} comit_succ = {$commit_succ} count={$comit_count} notify_count={$notify_count} notify_succ={$notify_succ} ",Log::DEBUG);
|
|
|
+ Log::record("auto_match channel {$name} state={$state} comit_succ={$commit_succ} count={$comit_count} notify_count={$notify_count} notify_succ={$notify_succ} ", Log::DEBUG);
|
|
|
}
|
|
|
|
|
|
return [$feeds,$profits];
|
|
@@ -366,7 +366,7 @@ class chctl
|
|
|
$state = "waking";
|
|
|
}
|
|
|
|
|
|
- return "{$name} {$state} time={$time} commit_succ={$commit_succ} notify_count={$notify_count} profit_ratio={$profit_ratio}";
|
|
|
+ return "{$name} {$state} time={$time} commit_succ={$commit_succ} notify_count={$notify_count} ratio={$ratio} profit_ratio={$profit_ratio}";
|
|
|
};
|
|
|
|
|
|
$desc_profit = function ($l, $r) use($out_price,$formater) {
|
|
@@ -461,7 +461,6 @@ class chctl
|
|
|
$names = array_unique($names);
|
|
|
Log::record("auto_match names=" . implode(',', $names), Log::DEBUG);
|
|
|
|
|
|
-// $can_feed = $left_time > self::timeout_level;
|
|
|
$can_feed = true;
|
|
|
$ctls = $speed_locker($names,$spec,$card_type,$quality);
|
|
|
[$sleeps,$workers] = $this->knockout($ctls,$spec);
|
|
@@ -470,6 +469,7 @@ class chctl
|
|
|
|
|
|
if(empty($workers)) {
|
|
|
$ctls = $sleeps;
|
|
|
+ $sleeps = [];
|
|
|
} else {
|
|
|
$ctls = $workers;
|
|
|
}
|
|
@@ -490,9 +490,9 @@ class chctl
|
|
|
}
|
|
|
|
|
|
if ($can_feed) {
|
|
|
- $result = array_merge($feed_names, $profit_names);
|
|
|
+ $result = array_merge($feed_names, $profit_names,$sleeps);
|
|
|
} else {
|
|
|
- $result = array_merge($profit_names,$feed_names);
|
|
|
+ $result = array_merge($profit_names,$feed_names,$sleeps);
|
|
|
}
|
|
|
|
|
|
$scan_feed = $can_feed ? 'true' : 'false';
|