CIRCL
/
AIL-framework
mirror of https://github.com/CIRCL/AIL-framework
2
1
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #202 from SteveClement/dev 

chg: [LAUNCH] Addded a "restart" option, killAll + launchAuto
dev
Steve Clement 2024-02-01 10:04:02 +01:00 committed by GitHub
parent 5bcd26637c db99bf0960
commit 1b9b085230
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bin/LAUNCH.sh
View File

@ -31,15 +31,19 @@ export PATH=$AIL_KVROCKS:$PATH
export PATH=$AIL_BIN:$PATH export PATH=$AIL_BIN:$PATH
export PATH=$AIL_FLASK:$PATH export PATH=$AIL_FLASK:$PATH
isredis=`screen -ls | egrep '[0-9]+.Redis_AIL' | cut -d. -f1` function isup {
isardb=`screen -ls | egrep '[0-9]+.ARDB_AIL' | cut -d. -f1` isredis=`screen -ls | egrep '[0-9]+.Redis_AIL' | cut -d. -f1`
iskvrocks=`screen -ls | egrep '[0-9]+.KVROCKS_AIL' | cut -d. -f1` isardb=`screen -ls | egrep '[0-9]+.ARDB_AIL' | cut -d. -f1`
islogged=`screen -ls | egrep '[0-9]+.Logging_AIL' | cut -d. -f1` iskvrocks=`screen -ls | egrep '[0-9]+.KVROCKS_AIL' | cut -d. -f1`
is_ail_core=`screen -ls | egrep '[0-9]+.Core_AIL' | cut -d. -f1` islogged=`screen -ls | egrep '[0-9]+.Logging_AIL' | cut -d. -f1`
is_ail_2_ail=`screen -ls | egrep '[0-9]+.AIL_2_AIL' | cut -d. -f1` is_ail_core=`screen -ls | egrep '[0-9]+.Core_AIL' | cut -d. -f1`
isscripted=`screen -ls | egrep '[0-9]+.Script_AIL' | cut -d. -f1` is_ail_2_ail=`screen -ls | egrep '[0-9]+.AIL_2_AIL' | cut -d. -f1`
isflasked=`screen -ls | egrep '[0-9]+.Flask_AIL' | cut -d. -f1` isscripted=`screen -ls | egrep '[0-9]+.Script_AIL' | cut -d. -f1`
isfeeded=`screen -ls | egrep '[0-9]+.Feeder_Pystemon' | cut -d. -f1` isflasked=`screen -ls | egrep '[0-9]+.Flask_AIL' | cut -d. -f1`
isfeeded=`screen -ls | egrep '[0-9]+.Feeder_Pystemon' | cut -d. -f1`
}
isup
function helptext { function helptext {
echo -e $YELLOW" echo -e $YELLOW"
@ -69,6 +73,7 @@ function helptext {
LAUNCH.sh LAUNCH.sh
[-l | --launchAuto] LAUNCH DB + Scripts [-l | --launchAuto] LAUNCH DB + Scripts
[-k | --killAll] Kill DB + Scripts [-k | --killAll] Kill DB + Scripts
[-kl | --killLaunch] Kill All & launchAuto
[-ks | --killscript] Scripts [-ks | --killscript] Scripts
[-u | --update] Update AIL [-u | --update] Update AIL
[-ut | --thirdpartyUpdate] Update UI/Frontend [-ut | --thirdpartyUpdate] Update UI/Frontend
@ -692,6 +697,10 @@ while [ "$1" != "" ]; do
;; ;;
-k | --killAll ) killall; -k | --killAll ) killall;
;; ;;
-kl | --killLaunch ) killall;
isup;
launch_all "automatic";
;;
-ks | --killscript ) killscript; -ks | --killscript ) killscript;
;; ;;
-m | --menu ) menu_display; -m | --menu ) menu_display;

6
var/www/modules/settings/templates/settings_index.html
View File

@ -43,8 +43,10 @@
<tbody> <tbody>
<tr> <tr>
<td>AIL Version</td> <td>AIL Version</td>
{%if ail_version != 'None'%} {%if ail_version is not none %}
<td>{{current_version}}<a target="_blank" href="https://github.com/ail-project/ail-framework/releases/tag/{{current_version}}" class="text-info"><small> (release note)</small></a></td> <td>{{current_version}}<a target="_blank" href="https://github.com/ail-project/ail-framework/releases/tag/{{current_version}}" class="text-info"><small> (release note)</small></a></td>
{%else%}
<td>{{git_metadata['current_branch']}}</td>
{%endif%} {%endif%}
</tr> </tr>
<tr <tr

6
var/www/templates/settings/settings_index.html
View File

@ -43,8 +43,10 @@
<tbody> <tbody>
<tr> <tr>
<td>AIL Version</td> <td>AIL Version</td>
{%if ail_version != 'None'%} {%if ail_version is not none %}
<td>{{ail_version}}<a target="_blank" href="https://github.com/ail-project/ail-framework/releases/tag/{{ail_version}}" class="text-info"><small> (release note)</small></a></td> <td>{{ail_version}}<a target="_blank" href="https://github.com/ail-project/ail-framework/releases/tag/{{ail_version}}" class="text-info"><small> (release note)</small></a></td>
{%else%}
<td>{{git_metadata['current_branch']}}</td>
{%endif%} {%endif%}
</tr> </tr>
<tr <tr