diff --git a/eccs_cron b/eccs_cron index 66e31336922a67d3fdacd3d8849fcb9cc5967385..1927dd3a048ec77be3b917839b4ebb5e1c45fdb7 100644 --- a/eccs_cron +++ b/eccs_cron @@ -1,5 +1,7 @@ -0 22 * * * root (echo "[start LogRotate]" && /usr/sbin/logrotate -v /etc/logrotate.d/eccs && echo "[end LogRotate]") > /proc/1/fd/1 2>&1 -15 22 * * * root /usr/bin/touch /home/eccs/eccs.ini -30 22 * * * root (echo "[start PyFF]" && /usr/local/bin/pyff --loglevel=DEBUG /home/eccs/pyff-config/sps-metadata.xml && echo "[end PyFF]") > /proc/1/fd/1 2>&1 -0 23 * * * root (echo "[start ECCS]" && /bin/bash /home/eccs/cleanAndRunEccs.sh && echo "[end ECCS]") 2>&1 | tee /proc/1/fd/1 > /home/eccs/debug/eccs_status -0 5 * * * root (echo "[start ECCS clean]" && /bin/bash /home/eccs/clean7daysOldFiles.sh && echo "[end ECCS clean]") > /proc/1/fd/1 2>&1 +DATEVAR=date +%Y-%m-%d_%H:%M:%S + +0 0 * * * root (echo "[$($DATEVAR) - start LogRotate]" && /usr/sbin/logrotate -v /etc/logrotate.d/eccs && echo "[$("DATEVAR) - end LogRotate]") > /proc/1/fd/1 2>&1 +10 0 * * * root /usr/bin/touch /home/eccs/eccs.ini +15 0 * * * root (echo "[$($DATEVAR) - start PyFF]" && /usr/local/bin/pyff --loglevel=DEBUG /home/eccs/pyff-config/sps-metadata.xml && echo "[$($DATEVAR) - end PyFF]") > /proc/1/fd/1 2>&1 +20 0 * * * root (echo "[$($DATEVAR) - start ECCS]" && /bin/bash /home/eccs/cleanAndRunEccs.sh && echo "[$($DATEVAR) - end ECCS]") 2>&1 | tee /proc/1/fd/1 > /home/eccs/debug/eccs_status +20 6 * * * root (echo "[$($DATEVAR) - start ECCS clean]" && /bin/bash /home/eccs/clean7daysOldFiles.sh && echo "[$($DATEVAR) - end ECCS clean]") > /proc/1/fd/1 2>&1 \ No newline at end of file diff --git a/runEccs.py b/runEccs.py index be6f247779fc9ab71b22a9baa81f0b01346b0162..e7b79cf044bca74b337621b0a724eb1973cae19d 100755 --- a/runEccs.py +++ b/runEccs.py @@ -134,7 +134,7 @@ if __name__=="__main__": cmd = "".join(cmd_list.pop()) proc_list.append(cmd) count = count + 1 - + asyncio.run(main(proc_list,stdout_file,stderr_file,cmd_file)) stdout_file.close() @@ -142,4 +142,4 @@ if __name__=="__main__": cmd_file.close() end = time.time() - print("Time taken in hh:mm:ss - ", str(datetime.timedelta(seconds=end - start))) + print("On "+str(datetime.date.today())+" the time taken in hh:mm:ss is " + str(datetime.timedelta(seconds=end - start))) diff --git a/web/jquery-ui.css b/web/jquery-ui.css index 34d99be728b9a6c9aa1f80356633a3f1aeb07ba2..af8f61fc1868b17e8a5c69c3cc53cea7837cf5e0 100644 --- a/web/jquery-ui.css +++ b/web/jquery-ui.css @@ -1065,31 +1065,31 @@ a.ui-button:active, } .ui-icon, .ui-widget-content .ui-icon { - background-image: url("images/ui-icons_004360_256x240.png"); + background-image: url("ui-icons_004360_256x240.png"); } .ui-widget-header .ui-icon { - background-image: url("images/ui-icons_004360_256x240.png"); + background-image: url("ui-icons_004360_256x240.png"); } .ui-state-hover .ui-icon, .ui-state-focus .ui-icon, .ui-button:hover .ui-icon, .ui-button:focus .ui-icon { - background-image: url("images/ui-icons_004360_256x240.png"); + background-image: url("ui-icons_004360_256x240.png"); } .ui-state-active .ui-icon, .ui-button:active .ui-icon { - background-image: url("images/ui-icons_ffffff_256x240.png"); + background-image: url("ui-icons_ffffff_256x240.png"); } .ui-state-highlight .ui-icon, .ui-button .ui-state-highlight.ui-icon { - background-image: url("images/ui-icons_777620_256x240.png"); + background-image: url("ui-icons_777620_256x240.png"); } .ui-state-error .ui-icon, .ui-state-error-text .ui-icon { - background-image: url("images/ui-icons_cc0000_256x240.png"); + background-image: url("ui-icons_cc0000_256x240.png"); } .ui-button .ui-icon { - background-image: url("images/ui-icons_004360_256x240.png"); + background-image: url("ui-icons_004360_256x240.png"); } /* positioning */ diff --git a/web/master.css b/web/master.css index 0e897ad735bba04d4dcf32ce3e04d706fc7c0cf9..07ce897ab1a1751ae3b4c2fdd3dae1decbd6f2ed 100644 --- a/web/master.css +++ b/web/master.css @@ -161,7 +161,7 @@ footer a { background-repeat: no-repeat; background-size: 20px 20px; background-position: 90% 5px; - background-image: url('../images/warning-icon.png'); + background-image: url('warning-icon.png'); } .entity_links { diff --git a/web/ui-icons_004360_256x240.png b/web/ui-icons_004360_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..e23a523dc151c1d34b50dafc5a07a5a797c7416c Binary files /dev/null and b/web/ui-icons_004360_256x240.png differ diff --git a/web/ui-icons_777620_256x240.png b/web/ui-icons_777620_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..9785948a293a095a65e34ffb775dfc252bb11c7b Binary files /dev/null and b/web/ui-icons_777620_256x240.png differ diff --git a/web/ui-icons_cc0000_256x240.png b/web/ui-icons_cc0000_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..45ac7787cd2bb4d6c3eea7e6e4a893034ddf75d8 Binary files /dev/null and b/web/ui-icons_cc0000_256x240.png differ diff --git a/web/ui-icons_ffffff_256x240.png b/web/ui-icons_ffffff_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..fe41d2d0fdd40f87538d2312fa537a799994e55b Binary files /dev/null and b/web/ui-icons_ffffff_256x240.png differ diff --git a/web/warning-icon.png b/web/warning-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b6fa4a96bcc7fc9901728a109227d8b8b7b79ac4 Binary files /dev/null and b/web/warning-icon.png differ