upstream/IYUUPlus
1
0
Fork 0
mirror of https://github.com/ledccn/IYUUPlus.git synced 2024-09-20 07:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
David 2022-04-10 23:17:33 +08:00
parent cd4218538e
commit f2459ce819
26 changed files with 55 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -11,3 +11,4 @@
/._.DS_Store
/.DS_Store
/php-cs-fixer.phar
.php_cs.cache

1
app/domain/Config.php
View File

@ -245,6 +245,7 @@ class Config
$cron = self::getCrontab();
return array_key_exists($uuid, $cron) ? $cron[$uuid] : [];
}
/**
* 禁用用户已经配置过的站点
* @param array $sites

17
process/Task.php
View File

@ -9,11 +9,6 @@ use app\domain\Crontab as domainCron;
class Task
{
/**
* pidFile
*/
const pidFile = 'IYUUTask.pid';
/**
* @var string
*/
@ -37,17 +32,12 @@ class Task
*/
public function __construct()
{
// 保存当前进程pid
if (function_exists('posix_getpid')) {
\file_put_contents(runtime_path() . \DIRECTORY_SEPARATOR . self::pidFile, \posix_getpid());
}
// 初始化cron
domainCron::onWorkerStart();
// 初始化计划任务的绝对路径
self::$cron_dir = cron_path() . DIRECTORY_SEPARATOR . domainCron::cron_dir;
//添加扫描器
Timer::add(self::$interval, array($this, 'startScan'));
}
/**
@ -55,8 +45,6 @@ class Task
*/
public function __destruct()
{
// 删除当前进程pid文件
is_file(runtime_path() . \DIRECTORY_SEPARATOR . self::pidFile) and @\unlink(runtime_path() . \DIRECTORY_SEPARATOR . self::pidFile);
}
/**
@ -65,12 +53,12 @@ class Task
public function onWorkerStart()
{
// 每10秒执行
new Crontab('*/10 * * * * *', function(){
new Crontab('*/10 * * * * *', function () {
//echo date('Y-m-d H:i:s')."\n";
});
// 每天的10点10执行，注意这里省略了秒位
new Crontab('10 10 * * *', function(){
new Crontab('10 10 * * *', function () {
//echo date('Y-m-d H:i:s')."\n";
});
}
@ -159,6 +147,7 @@ class Task
public function clearTimer(string $filename = '')
{
$_instances = Crontab::getAll(); // Crontab对象数组
/** @var Crontab $crontab */
foreach ($_instances as $id => $crontab) {
$name = $crontab->getName();
// 关键条件

1
process/Websocket.php
View File

@ -37,5 +37,4 @@ class Websocket
{
echo "onClose\n";
}
}

12
src/Reseed/AutoReseed.php
View File

@ -1067,13 +1067,19 @@ class AutoReseed
if (!empty($weixin['notify_on_change'])) {
switch ($weixin['notify_on_change']) {
case 'on':
if (self::$wechatMsg['reseedSuccess'] === 0 && self::$wechatMsg['reseedError'] === 0) return '';
if (self::$wechatMsg['reseedSuccess'] === 0 && self::$wechatMsg['reseedError'] === 0) {
return '';
}
break;
case 'only_success':
if (self::$wechatMsg['reseedSuccess'] === 0) return '';
if (self::$wechatMsg['reseedSuccess'] === 0) {
return '';
}
break;
case 'only_fails':
if (self::$wechatMsg['reseedError'] === 0) return '';
if (self::$wechatMsg['reseedError'] === 0) {
return '';
}
break;
case 'off':
default:

15
src/Reseed/MoveTorrent.php
View File

@ -315,13 +315,19 @@ class MoveTorrent extends AutoReseed
if (!empty($weixin['notify_on_change'])) {
switch ($weixin['notify_on_change']) {
case 'on':
if (self::$wechatMsg['MoveSuccess'] === 0 && self::$wechatMsg['MoveError'] === 0) return '';
if (self::$wechatMsg['MoveSuccess'] === 0 && self::$wechatMsg['MoveError'] === 0) {
return '';
}
break;
case 'only_success':
if (self::$wechatMsg['MoveSuccess'] === 0) return '';
if (self::$wechatMsg['MoveSuccess'] === 0) {
return '';
}
break;
case 'only_fails':
if (self::$wechatMsg['MoveError'] === 0) return '';
if (self::$wechatMsg['MoveError'] === 0) {
return '';
}
break;
case 'off':
default:
@ -337,8 +343,7 @@ class MoveTorrent extends AutoReseed
$desp .= '**移动成功：'.static::$wechatMsg['MoveSuccess']. '** [会把hash加入移动缓存]' .$br;
$desp .= '**移动失败：'.static::$wechatMsg['MoveError']. '** [解决错误提示，可以重试]' .$br;
$desp .= '**如需重新移动，请删除 ./torrent/cachemove 移动缓存。**'.$br;
}
else{
} else {
$desp .= $br.'----------'.$br;
$desp .= $br.'转移任务完成，未发现种子需要转移'.$br;
$desp .= $br.'----------'.$br;

1
support/Db.php
View File

@ -21,5 +21,4 @@ use Illuminate\Database\Capsule\Manager;
*/
class Db extends Manager
{
}

1
support/Model.php
View File

@ -18,5 +18,4 @@ use Illuminate\Database\Eloquent\Model as BaseModel;
class Model extends BaseModel
{
}

1
support/Request.php
View File

@ -19,5 +19,4 @@ namespace support;
*/
class Request extends \Webman\Http\Request
{
}

1
support/Response.php
View File

@ -19,5 +19,4 @@ namespace support;
*/
class Response extends \Webman\Http\Response
{
}

3
support/bootstrap/Log.php
View File

@ -30,7 +30,8 @@ use Monolog\Logger;
* @method static void alert($message, array $context = [])
* @method static void emergency($message, array $context = [])
*/
class Log implements Bootstrap {
class Log implements Bootstrap
{
/**
* @var array

6
support/bootstrap/Redis.php
View File

@ -197,7 +197,8 @@ use Illuminate\Redis\RedisManager;
* @method static mixed getPersistentID()
* @method static mixed getAuth()
*/
class Redis implements Bootstrap {
class Redis implements Bootstrap
{
/**
* @var RedisManager
@ -221,7 +222,8 @@ class Redis implements Bootstrap {
* @param string $name
* @return \Illuminate\Redis\Connections\Connection
*/
public static function connection($name = 'default') {
public static function connection($name = 'default')
{
return static::$_manager->connection($name);
}

3
support/bootstrap/Session.php
View File

@ -22,7 +22,8 @@ use Workerman\Worker;
* Class Session
* @package support
*/
class Session implements Bootstrap {
class Session implements Bootstrap
{
/**
* @param Worker $worker

3
support/bootstrap/Translation.php
View File

@ -24,7 +24,8 @@ use Symfony\Component\Translation\Loader\PhpFileLoader;
* @method static void setLocale(string $locale)
* @method static string getLocale()
*/
class Translation implements Bootstrap {
class Translation implements Bootstrap
{
/**
* @var array

2
support/bootstrap/db/Heartbeat.php
View File

@ -30,7 +30,7 @@ class Heartbeat implements Bootstrap
*/
public static function start($worker)
{
\Workerman\Timer::add(55, function (){
\Workerman\Timer::add(55, function () {
Db::select('select 1 limit 1');
});
}

2
support/bootstrap/db/Laravel.php
View File

@ -39,7 +39,7 @@ class Laravel implements Bootstrap
$capsule = new Capsule;
$configs = config('database');
$capsule->getDatabaseManager()->extend('mongodb', function($config, $name) {
$capsule->getDatabaseManager()->extend('mongodb', function ($config, $name) {
$config['name'] = $name;
return new Connection($config);

1
support/exception/BusinessException.php
View File

@ -21,5 +21,4 @@ use Exception;
*/
class BusinessException extends Exception
{
}

1
support/exception/Handler.php
View File

@ -37,5 +37,4 @@ class Handler extends ExceptionHandler
{
return parent::render($request, $exception);
}
}

6
support/helpers.php
View File

@ -238,7 +238,8 @@ function locale(string $locale)
* @param $worker
* @param $class
*/
function worker_bind($worker, $class) {
function worker_bind($worker, $class)
{
$callback_map = [
'onConnect',
'onMessage',
@ -262,7 +263,8 @@ function worker_bind($worker, $class) {
/**
* @return int
*/
function cpu_count() {
function cpu_count()
{
if (strtolower(PHP_OS) === 'darwin') {
$count = shell_exec('sysctl -n machdep.cpu.core_count');
} else {