amass/Older
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make command not block.
Some checks failed
Deploy Docker Images / Build dockerfile and Server deploy (push) Successful in 15s
Details
Deploy / Build (push) Failing after 2m55s
Details

Browse Source
This commit is contained in:
amass 2024-11-10 20:29:54 +08:00
parent e833d990db
commit 0fca4a6e41
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitea/workflows/deploy.yaml
View File

@ -48,13 +48,13 @@ jobs:
username: ${{ vars.YUYUN_USER }} username: ${{ vars.YUYUN_USER }}
password: ${{ secrets.SERVER_ROOT_PASSWORD }} password: ${{ secrets.SERVER_ROOT_PASSWORD }}
script: | script: |
cd /root/Server cd /root/Server;
source /etc/profile source /etc/profile;
/root/Server/HttpServer --exit /root/Server/HttpServer --exit;
sleep 10 sleep 10;
cp /tmp/HttpServer /root/Server/HttpServer cp /tmp/HttpServer /root/Server/HttpServer;
/root/Server/HttpServer & /root/Server/HttpServer &;
exit 0 exit 0;
- name: Notify-End - name: Notify-End
if: ${{ always() }} if: ${{ always() }}
run: | run: |

1
Server/Application.cpp
View File

@ -346,7 +346,6 @@ void Application::startAcceptRequest() {
} }
void Application::requetExit() { void Application::requetExit() {
nng_log_set_logger(nng_stderr_logger);
LOG(info) << "send exit request to program."; LOG(info) << "send exit request to program.";
Nng::Socket request(Nng::Request); Nng::Socket request(Nng::Request);
request.setOption(Nng::RecvTimeout, std::chrono::milliseconds(2000)); request.setOption(Nng::RecvTimeout, std::chrono::milliseconds(2000));