From bcdb6efd8c90d3c340071ef1d8449dbe79d9eb6b Mon Sep 17 00:00:00 2001 From: wandoubaba Date: Thu, 6 Jul 2023 13:45:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dinstall.sh=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/start.php | 5 ++++- install.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/deploy/start.php b/deploy/start.php index ea5bd13..beed961 100644 --- a/deploy/start.php +++ b/deploy/start.php @@ -19,15 +19,18 @@ $log->pushHandler(new StreamHandler(__DIR__ . '/workerman.log', Logger::INFO)); $worker = new Worker('http://0.0.0.0:8787'); $worker->onMessage = function (TcpConnection $connection, Request $request) use ($log) { - $log->info('Received POST data', $request->post()); + $log->info('Received POST data: ', $request->post()); $work_dir = isset($_ENV['WORK_DIR']) ? $_ENV['WORK_DIR'] : null; $branch = isset($_ENV['BRANCH']) ? $_ENV['BRANCH'] : null; $git_url = isset($_ENV['GIT_URL']) ? $_ENV['GIT_URL'] : null; + $log->info('env: ' . json_encode(['work_dir' => $work_dir, 'branch' => $branch, 'git_url' => $git_url], JSON_UNESCAPED_UNICODE)); if ($work_dir && $branch && $git_url) { $repository = $request->post('repository'); + $log->info('repository: ', $repository); if (is_array($repository)) { $ssh_url = isset($repository['ssh_url']) ? $repository['ssh_url'] : null; $clone_url = isset($repository['clone_url']) ? $repository['clone_url'] : null; + $log->info('ssh_url & clone_url: ' . json_encode(['ssh_url' => $ssh_url, 'clone_url' => $clone_url], JSON_UNESCAPED_UNICODE)); if ($git_url === $ssh_url || $git_url === $clone_url) { chdir($work_dir); shell_exec("sh auto_build.sh > /dev/null &"); diff --git a/install.sh b/install.sh index 488dfe1..03a1718 100644 --- a/install.sh +++ b/install.sh @@ -37,7 +37,7 @@ else # 创建.env文件 branch=$(git branch --show-current) git_url=$(git remote -v | grep fetch | awk '{print $2}') - echo "WORD_DIR = \"$work_dir\"" >"$env_file" + echo "WORK_DIR = \"$work_dir\"" >"$env_file" echo "BRANCH = \"$branch\"" >>"$env_file" echo "GIT_URL = \"$git_url\"" >>"$env_file" echo "[$(date +"%Y-%m-%d %H:%M:%S")] .env文件创建成功" >>"$log_file"