Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev kmr #508

Merged
merged 6 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions rickshaw-run
Original file line number Diff line number Diff line change
Expand Up @@ -1831,25 +1831,29 @@ sub load_settings_info() {

($rc, $workshop_refresh_timestamps_token_file) = get_json_setting("workshop.refresh-timestamps.token-file", $jsonsettings);
if ($rc != 0) {
debug_log("load_settings_info(): failed to load workshop refresh-timestamps token-file\n");
print "load_settings_info(): failed to load workshop refresh-timestamps token-file\n";
exit 1;
} else {
if (open(TOKEN, "<", $workshop_refresh_timestamps_token_file)) {
$workshop_refresh_timestamps_token = <TOKEN>;
chomp($workshop_refresh_timestamps_token);
close TOKEN;
} else {
printf "load_settings_file(): failed to load token from workshop refresh-timestamps token-file\n";
exit 1;
}

printf "load_settings_info(): loaded workshop refresh-timestamps token-file: %s\n", $workshop_refresh_timestamps_token_file;
if (defined $workshop_refresh_timestamps_token_file) {
if (open(TOKEN, "<", $workshop_refresh_timestamps_token_file)) {
$workshop_refresh_timestamps_token = <TOKEN>;
chomp($workshop_refresh_timestamps_token);
close TOKEN;
} else {
printf "load_settings_file(): failed to load token from workshop refresh-timestamps token-file\n";
exit 1;
}

($rc, $workshop_refresh_timestamps_api_url) = get_json_setting("workshop.refresh-timestamps.api-url", $jsonsettings);
printf "load_settings_info(): loaded workshop refresh-timestamps token-file: %s\n", $workshop_refresh_timestamps_token_file;
}
}

if ($rc != 0) {
print "load_settings_info(): failed to load workshop refresh-timestamps api-url\n";
exit 1;
} else {
($rc, $workshop_refresh_timestamps_api_url) = get_json_setting("workshop.refresh-timestamps.api-url", $jsonsettings);
if ($rc != 0) {
print "load_settings_info(): failed to load workshop refresh-timestamps api-url\n";
exit 1;
} else {
if (defined $workshop_refresh_timestamps_api_url) {
printf "load_settings_info(): loaded workshop refresh-timestamps api-url: %s\n", $workshop_refresh_timestamps_api_url;
}
}
Expand Down
6 changes: 5 additions & 1 deletion rickshaw-settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@
}
},
"workshop": {
"force-builds": "false"
"force-builds": "false",
"refresh-timestamps": {
"token-file": null,
k-rister marked this conversation as resolved.
Show resolved Hide resolved
"api-url": null
}
},
"quay": {
"image-expiration": "2w"
k-rister marked this conversation as resolved.
Show resolved Hide resolved
Expand Down