Skip to content

Commit 85b3ce0

Browse files
authored
Merge branch 'v2025.xx.xx' into 4489-improve-the-way-allsky-is-compiled
2 parents 634990f + 1697753 commit 85b3ce0

3 files changed

Lines changed: 8 additions & 7 deletions

File tree

config_repo/allsky.service.repo

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ ExecStart=XX_ALLSKY_HOME_XX/allsky.sh
99
SyslogIdentifier=allsky
1010
Restart=on-success
1111
RestartSec=2
12-
; exit status 100 and higher mean a fatal error the user needs to fix, so don't restart
13-
RestartPreventExitStatus=100 101
12+
; These exit code are fatal.
13+
RestartPreventExitStatus=XX_NO_RESTART_CODES_XX
14+
1415
; XXX RestartKillSignal is not recognized by the systemd that comes with Buster (not sure about Bullseye),
1516
; so use ExecReload instead.
1617
; RestartKillSignal=SIGUSR1
17-
ExecReload=XX_ALLSKY_SCRIPTS_XX/reload.sh $MAINPID
18+
ExecReload=XX_ALLSKY_UTILITIES_XX/reload.sh $MAINPID
1819

1920
[Install]
2021
WantedBy=multi-user.target

config_repo/allskyperiodic.service.repo

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ ExecStart=XX_ALLSKY_SCRIPTS_XX/periodic.sh
99
SyslogIdentifier=allskperiodic
1010
Restart=on-success
1111
RestartSec=5
12-
; exit status 100 and higher mean a fatal error the user needs to fix, so don't restart
13-
RestartPreventExitStatus=100 101
12+
; These exit code are fatal.
13+
RestartPreventExitStatus=XX_NO_RESTART_CODES_XX
1414

1515
[Install]
1616
WantedBy=multi-user.target

scripts/utilities/allsky-config.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -709,10 +709,10 @@ if [[ -z ${CMD} ]]; then
709709
CMDS+=("show_start_times" "$( L "Show daytime and nighttime start times" )"); ((N++))
710710
CMDS+=("compare_paths" "$( L "Compare upload and Website paths" )"); ((N++))
711711
CMDS+=("get_brightness_info" "$( L "Get information on image brightness" )"); ((N++))
712+
CMDS+=("check_post_data" "$( L "Troubleshoot the 'data.json is X days old' message" )"); ((N++))
713+
CMDS+=("get_filesystems" "$( L "Determine where a secodary storage device is" )"); ((N++))
712714
CMDS+=("encoders" "$( L "Show list of timelapse encoders available" )"); ((N++))
713715
CMDS+=("pix_fmts" "$( L "Show list of timelapse pixel formats available" )"); ((N++))
714-
CMDS+=("check_post_data" "$( L "Helps resolve the 'data.json is X days old' message" )"); ((N++))
715-
CMDS+=("get_filesystems" "$( L "Helps determine where a storage device is" )"); ((N++))
716716

717717
# If the user selects "Cancel" prompt() returns 1 and we exit the loop.
718718
while COMMAND="$( prompt "${PROMPT}" "${CMDS[@]}" )"

0 commit comments

Comments
 (0)