Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
b5ea457491 | |||
eaf8d2e0bb | |||
616663ffe0 | |||
1cd182b3a9 | |||
ccd4f4d051 |
@@ -25,7 +25,9 @@ function kill-project {
|
||||
}
|
||||
|
||||
function reload-project {
|
||||
# Nothing to do, run.sh and main.js automatically uses the latest files.
|
||||
# Not much to do, run.sh and main.js automatically uses the latest files.
|
||||
rm -v files/photos/index.html
|
||||
# TBD/TODO: Call check_photos.sh once it has been pulled from run.sh.
|
||||
log "Project reloaded successfully!"
|
||||
}
|
||||
|
46
check_photos.sh
Executable file
46
check_photos.sh
Executable file
@@ -0,0 +1,46 @@
|
||||
#!/usr/bin/env bash
|
||||
# 2025-10-15 Hyperling
|
||||
# Create script which does the photo checking so that it can be called by
|
||||
# scripts other than just run.sh, such as if it needs used in check_git.sh.
|
||||
|
||||
## Setup ##
|
||||
|
||||
DIR="$(dirname -- "${BASH_SOURCE[0]}")"
|
||||
PROG="$(basename -- "${BASH_SOURCE[0]}")"
|
||||
cd $DIR
|
||||
DIR="`pwd`"
|
||||
NAME="'$PROG'"
|
||||
|
||||
function log {
|
||||
echo -e "`date` : $NAME - $1"
|
||||
}
|
||||
|
||||
## Parameters ##
|
||||
|
||||
ports="$1"
|
||||
|
||||
## Main ##
|
||||
|
||||
count=1
|
||||
http_code=0
|
||||
port="${ports%% *}"
|
||||
photos_uri=":$port/photos/"
|
||||
beg_time="$SECONDS"
|
||||
while [[ $http_code != "200" ]]; do
|
||||
log "Sleeping for '$count' while waiting for $photos_uri to come up."
|
||||
sleep $count
|
||||
log "Checking if $photos_uri is available."
|
||||
http_code="`curl --silent --fail -w '\n%{http_code}' localhost$photos_uri | tail -n 1`"
|
||||
log "Check for $photos_uri responded with '$http_code'."
|
||||
if (( $count >= 10 )); then
|
||||
log "Giving up on loading $photos_uri after '$count' attempts."
|
||||
break
|
||||
else
|
||||
count=$(( count + 1 ))
|
||||
fi
|
||||
done
|
||||
end_time="$SECONDS"
|
||||
time="$(( $end_time - $beg_time ))"
|
||||
log "Finished checking for /photos/ after '$time' seconds."
|
||||
|
||||
exit 0
|
@@ -29,7 +29,7 @@
|
||||
<div class="row">
|
||||
<div class="col-12 text">
|
||||
<p>
|
||||
Click the link below to download the 4-page PDF:
|
||||
Use the links below to download the 4-page PDF:
|
||||
</p>
|
||||
<ul class="indent">
|
||||
<li>
|
||||
|
@@ -30,7 +30,7 @@
|
||||
<div class="row">
|
||||
<div class="col-12 text">
|
||||
<p>
|
||||
Click the link below to download the 10-page PDF:
|
||||
Use the links below to download the 10-page PDF:
|
||||
</p>
|
||||
<ul class="indent">
|
||||
<li>
|
||||
|
@@ -10,11 +10,7 @@
|
||||
<a href='/about/'>
|
||||
<div class="row">
|
||||
<?php if ($show_pics) echo '
|
||||
<div class="col-3 header center banner-image banner-image01">
|
||||
<!-<img src="/files/media/icons/home.jpg"
|
||||
alt="<<banner01.jpg>>"
|
||||
>-->
|
||||
</div>
|
||||
<div class="col-3 header center banner-image banner-image01"></div>
|
||||
';?>
|
||||
<div class="col-<?php echo "$banner_width"; ?> header">
|
||||
<div class="banner-top">Peace</div>
|
||||
@@ -22,11 +18,7 @@
|
||||
<div class="banner-bottom">Happiness</div>
|
||||
</div>
|
||||
<?php if ($show_pics) echo '
|
||||
<div class="col-3 header center banner-image banner-image02">
|
||||
<!--<img src="/files/media/icons/contact.jpg"
|
||||
alt="<<banner02.jpg>>"
|
||||
>-->
|
||||
</div>
|
||||
<div class="col-3 header center banner-image banner-image02"></div>
|
||||
';?>
|
||||
</div>
|
||||
</a>
|
||||
|
28
run.sh
28
run.sh
@@ -123,35 +123,15 @@ log "Removing old index files."
|
||||
find files/photos/ -name "*".html -print -delete
|
||||
{
|
||||
check_main photos
|
||||
count=1
|
||||
http_code=0
|
||||
port="${ports%% *}"
|
||||
photos_uri=":$port/photos/"
|
||||
beg_time="$SECONDS"
|
||||
while [[ $http_code != "200" ]]; do
|
||||
log "Sleeping for '$count' while waiting for $photos_uri to come up."
|
||||
sleep $count
|
||||
log "Checking if $photos_uri is available."
|
||||
http_code="`curl --silent --fail -w '\n%{http_code}' localhost$photos_uri | tail -n 1`"
|
||||
log "Check for $photos_uri responded with '$http_code'."
|
||||
if (( $count >= 10 )); then
|
||||
log "Giving up on loading $photos_uri after '$count' attempts."
|
||||
break
|
||||
else
|
||||
count=$(( count + 1 ))
|
||||
fi
|
||||
done
|
||||
end_time="$SECONDS"
|
||||
time="$(( $end_time - $beg_time ))"
|
||||
log "Finished checking for /photos/ after '$time' seconds."
|
||||
$DIR/check_photos.sh "$ports"
|
||||
} &
|
||||
|
||||
## Main ##
|
||||
|
||||
log "Start local cronjob."
|
||||
log "Start check_git."
|
||||
while true; do
|
||||
check_main cronjob
|
||||
$DIR/cronjob.sh
|
||||
check_main check_git
|
||||
$DIR/check_git.sh
|
||||
sleep 30
|
||||
done &
|
||||
|
||||
|
Reference in New Issue
Block a user