From 141a07ccae892dc501d4f68b88d31836d26e4818 Mon Sep 17 00:00:00 2001 From: Freddie Akeroyd Date: Tue, 11 Feb 2025 20:53:18 +0000 Subject: [PATCH] Add timestamps --- start_blockserver.bat | 2 +- start_bs_to_kafka_cmd.bat | 2 +- start_database_server.bat | 2 +- stop_blockserver.bat | 8 +++++--- stop_database_server.bat | 8 +++++--- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/start_blockserver.bat b/start_blockserver.bat index ae6c5293..eac7a067 100644 --- a/start_blockserver.bat +++ b/start_blockserver.bat @@ -13,7 +13,7 @@ for /F "usebackq" %%I in (`%ICPCYGBIN%\cygpath %IOCLOGROOT%`) do SET IOCCYGLOGRO set BLOCKSERVER_CONSOLEPORT=9006 -@echo Starting blockserver (console port %BLOCKSERVER_CONSOLEPORT%) +@echo %DATE% %TIME% Starting blockserver (console port %BLOCKSERVER_CONSOLEPORT%) set BLOCKSERVER_CMD=%MYDIRBLOCK%start_blockserver_cmd.bat REM Unlike IOC we are not using "--noautorestart --wait" so gateway will start immediately and also automatically restart on exit diff --git a/start_bs_to_kafka_cmd.bat b/start_bs_to_kafka_cmd.bat index 2c342d03..19d9629f 100644 --- a/start_bs_to_kafka_cmd.bat +++ b/start_bs_to_kafka_cmd.bat @@ -9,5 +9,5 @@ set EPICS_CAS_INTF_ADDR_LIST=127.0.0.1 set EPICS_CAS_BEACON_ADDR_LIST=127.255.255.255 set PYTHONUNBUFFERED=TRUE - +@echo %DATE% %TIME% starting BS to Kafka %PYTHON3W% %MYDIRCD%\BlockServerToKafka\main.py -d %INSTRUMENT%_sampleEnv -c forwarder_config -b livedata.isis.cclrc.ac.uk:9092 -p %MYPVPREFIX% diff --git a/start_database_server.bat b/start_database_server.bat index 96f2cd92..6187d90b 100644 --- a/start_database_server.bat +++ b/start_database_server.bat @@ -13,7 +13,7 @@ for /F "usebackq" %%I in (`%ICPCYGBIN%\cygpath %IOCLOGROOT%`) do SET IOCCYGLOGRO set DBSERVER_CONSOLEPORT=9009 -@echo Starting dbserver (console port %DBSERVER_CONSOLEPORT%) +@echo %DATE% %TIME% Starting dbserver (console port %DBSERVER_CONSOLEPORT%) set DBSERVER_CMD=%MYDIRBLOCK%start_database_server_cmd.bat REM Unlike IOC we are not using "--noautorestart --wait" so gateway will start immediately and also automatically restart on exit diff --git a/stop_blockserver.bat b/stop_blockserver.bat index f6665c9e..370f8aa4 100644 --- a/stop_blockserver.bat +++ b/stop_blockserver.bat @@ -4,11 +4,13 @@ set MYDIR=%~dp0 REM kill procservs that manage process, which in turn terminates the process set CSPID= -for /F %%i in ( c:\instrument\var\run\EPICS_BLOCKSVR.pid ) DO set CSPID=%%i +if exist "c:\instrument\var\run\EPICS_BLOCKSVR.pid" ( + for /F %%i in ( c:\instrument\var\run\EPICS_BLOCKSVR.pid ) DO set CSPID=%%i +) if "%CSPID%" == "" ( - @echo blockserver procServ is not running + @echo %DATE% %TIME% blockserver procServ is not running ) else ( - @echo Killing blockserver procServ PID %CSPID% + @echo %DATE% %TIME% Killing blockserver procServ cygwin PID %CSPID% %ICPCYGBIN%\kill.exe %CSPID% del c:\instrument\var\run\EPICS_BLOCKSVR.pid ) diff --git a/stop_database_server.bat b/stop_database_server.bat index 4fd0713b..83f2bf04 100644 --- a/stop_database_server.bat +++ b/stop_database_server.bat @@ -4,11 +4,13 @@ set MYDIR=%~dp0 REM kill procservs that manage process, which in turn terminates the process set CSPID= -for /F %%i in ( c:\instrument\var\run\EPICS_DBSVR.pid ) DO set CSPID=%%i +if exist "c:\instrument\var\run\EPICS_DBSVR.pid" ( + for /F %%i in ( c:\instrument\var\run\EPICS_DBSVR.pid ) DO set CSPID=%%i +) if "%CSPID%" == "" ( - @echo dbserver procServ is not running + @echo %DATE% %TIME% dbserver procServ is not running ) else ( - @echo Killing dbserver procServ PID %CSPID% + @echo %DATE% %TIME% Killing dbserver procServ cygwin PID %CSPID% %ICPCYGBIN%\kill.exe %CSPID% del c:\instrument\var\run\EPICS_DBSVR.pid )