no message
This commit is contained in:
parent
4717641c9f
commit
f1f455a7c4
@ -47,9 +47,10 @@ final class FreenodeCrawl
|
|||||||
|
|
||||||
$sFileName = str_replace("{{Ymd}}", date("Ymd"), $v);
|
$sFileName = str_replace("{{Ymd}}", date("Ymd"), $v);
|
||||||
|
|
||||||
$sUrlSend = "http://".$aFrom["url_base"].$aFrom["url_node"].$sFileName;
|
$sUrlSend = "https://".$aFrom["url_base"].$aFrom["url_node"].$sFileName;
|
||||||
|
|
||||||
$sFileContent = self::curl($sUrlSend) ?? "";
|
$sFileContent = self::curl($sUrlSend) ?? "";
|
||||||
|
// tomd($sUrlSend);
|
||||||
// tomd($sFileContent, 1);
|
// tomd($sFileContent, 1);
|
||||||
if (!$sFileContent) {
|
if (!$sFileContent) {
|
||||||
return [];
|
return [];
|
||||||
|
|||||||
@ -40,11 +40,11 @@ final class FreenodeSync
|
|||||||
|
|
||||||
$sApiUrl = "https://".$oFnSite->url."/".$sSiteApiFreenodeReceive;
|
$sApiUrl = "https://".$oFnSite->url."/".$sSiteApiFreenodeReceive;
|
||||||
$sResult = HttpV2::make($sApiUrl, "post")->setDataA($aFnContent)->enableJsonSend()->send();
|
$sResult = HttpV2::make($sApiUrl, "post")->setDataA($aFnContent)->enableJsonSend()->send();
|
||||||
|
|
||||||
$aResult = json_decode($sResult, true);
|
$aResult = json_decode($sResult, true);
|
||||||
|
|
||||||
if (!isset($aResult["is_done"]) || $aResult["is_done"] != true) {
|
if (!isset($aResult["is_done"]) || $aResult["is_done"] != true) {
|
||||||
$sMsg = "freenodeSync::同步失败 ->".json_encode($oFnSite->toArray())."->".$sResult;
|
$sMsg = "freenodeSync::同步失败 ->".$oFnSite->name."->".$sResult;
|
||||||
echo $sMsg;
|
echo $sMsg;
|
||||||
TeleSlave::warn()->setMsgS($sMsg)->send();
|
TeleSlave::warn()->setMsgS($sMsg)->send();
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
11
fn部署.md
11
fn部署.md
@ -7,6 +7,8 @@ master加crawl_freenode表,加freenode_pool表
|
|||||||
|
|
||||||
master的fn文件夹里加template
|
master的fn文件夹里加template
|
||||||
|
|
||||||
|
master加dog_option表
|
||||||
|
|
||||||
cfn的option里嫁freenode_client
|
cfn的option里嫁freenode_client
|
||||||
|
|
||||||
cnf加http_queue表 - 不用
|
cnf加http_queue表 - 不用
|
||||||
@ -49,3 +51,12 @@ CREATE TABLE `freenode_pool` (
|
|||||||
PRIMARY KEY (`id`),
|
PRIMARY KEY (`id`),
|
||||||
KEY `date` (`date`)
|
KEY `date` (`date`)
|
||||||
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
|
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
|
||||||
|
|
||||||
|
CREATE TABLE `dog_option` (
|
||||||
|
`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
|
||||||
|
`dog_name` varchar(255) DEFAULT NULL,
|
||||||
|
`k` varchar(255) DEFAULT NULL,
|
||||||
|
`v` varchar(255) DEFAULT NULL,
|
||||||
|
PRIMARY KEY (`id`),
|
||||||
|
UNIQUE KEY `unique_this_name_k` (`dog_name`,`k`)
|
||||||
|
) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user