windows shutdown handling and setup changes
Some checks failed
BlockStorage/repertory/pipeline/head There was a failure building this commit

This commit is contained in:
2025-09-08 11:03:38 -05:00
parent ba21676c2b
commit 1ed322b0c7
3 changed files with 78 additions and 8 deletions

68
.jenkins_msys2 Normal file
View File

@@ -0,0 +1,68 @@
#!groovy
pipeline {
agent none
environment {
PROJECT_TEST_CONFIG_DIR = "c:\\.ci\\repertory\\test"
}
options {
disableConcurrentBuilds()
skipDefaultCheckout()
timestamps()
}
stages {
stage('Build • Test') {
agent any
stages {
stage('Checkout') {
steps {
script {
int maxAttempts = 6
int baseDelay = 10
for (int attempt = 1; attempt <= maxAttempts; attempt++) {
try {
checkout scm
break
} catch (err) {
if (attempt == maxAttempts) { throw err }
int waitSec = baseDelay * (1 << (attempt - 1))
echo "Checkout failed (attempt ${attempt}/${maxAttempts}). Waiting ${waitSec}s before retry..."
sleep time: waitSec, unit: 'SECONDS'
}
}
}
}
}
stage('msys2') {
steps {
script { retryWithBackoff(2, 5) { sh 'scripts\\make_win32.cmd' } }
}
}
stage('msys2_test') {
steps {
script { retryWithBackoff(2, 5) { sh 'scripts\\run_tests.cmd' } }
}
}
}
}
}
}
def retryWithBackoff(int maxAttempts, int baseDelaySeconds, Closure body) {
for (int attempt = 1; attempt <= maxAttempts; attempt++) {
try {
body()
return
} catch (err) {
if (attempt == maxAttempts) { throw err }
int waitSec = baseDelaySeconds * (1 << (attempt - 1))
echo "Step failed (attempt ${attempt}/${maxAttempts}). Waiting ${waitSec}s before retry..."
sleep time: waitSec, unit: 'SECONDS'
}
}
}

View File

@@ -162,8 +162,10 @@ Source: "3rd_party\winfsp-@WINFSP_VERSION@.msi"; DestDir: "{app}"; Flags: ignore
[Icons]
Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Parameters: "-ui --hidden"; IconFilename: "{app}\icon.ico"
Name: "{userstartup}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Parameters: "-ui -lo --hidden"; IconFilename: "{app}\icon.ico"
[Run]
Filename: "msiexec.exe"; WorkingDir: "{app}"; Parameters: "/i winfsp-@WINFSP_VERSION@.msi /norestart"; \
Flags: 64bit waituntilterminated; Components: winfsp
Flags: 64bit hidewizard waituntilterminated skipifsilent; Components: winfsp
Filename: "{app}\repertory.exe"; WorkingDir: "{app}"; Parameters: "-ui --hidden"; \
Description: "Launch Repertory Management Portal"; \
Flags: 64bit runhidden nowait postinstall skipifsilent; Components: full custom

View File

@@ -276,13 +276,16 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server)
static std::atomic<httplib::Server *> this_server{server_};
static const auto quit_handler = [](int /* sig */) {
auto *ptr = this_server.load();
auto *ptr = this_server.exchange(nullptr);
if (ptr == nullptr) {
return;
}
this_server = nullptr;
#if defined(_WIN32)
std::jthread([ptr]() { ptr->stop(); });
#else // !defined(_WIN32)
ptr->stop();
#endif // defined(_WIN32)
};
std::signal(SIGINT, quit_handler);
@@ -348,10 +351,7 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server)
auto_mount.join();
server_->listen("127.0.0.1", config_->get_api_port());
if (this_server != nullptr) {
this_server = nullptr;
server_->stop();
}
quit_handler(SIGTERM);
}
handlers::~handlers() {