Skip to content

Commit a7567ea

Browse files
Update journal parser
1 parent 14c3dc0 commit a7567ea

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

installation_and_upgrade/ibex_install_utils/install_tasks.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ def run_test_update(self) -> None:
133133
self._client_tasks.install_ibex_client()
134134
self._system_tasks.upgrade_notepad_pp()
135135
self._server_tasks.setup_log_rotation()
136+
self._server_tasks.update_journal_parser()
136137

137138
def remove_all_and_install_client_and_server(self) -> None:
138139
"""Either install or upgrade the ibex client and server"""
@@ -192,6 +193,7 @@ def run_instrument_install(self) -> None:
192193
self._system_tasks.put_autostart_script_in_startup_area()
193194
self._python_tasks.update_script_definitions()
194195
self._server_tasks.setup_log_rotation()
196+
self._server_tasks.update_journal_parser()
195197

196198
def run_update_icp(self) -> None:
197199
self._server_tasks.update_icp(self.icp_in_labview_modules())
@@ -250,6 +252,7 @@ def run_instrument_deploy_main(self) -> None:
250252
self._python_tasks.update_script_definitions()
251253
self._python_tasks.remove_instrument_script_githooks()
252254
self._server_tasks.setup_log_rotation()
255+
self._server_tasks.update_journal_parser()
253256
self._system_tasks.update_kafka_topics()
254257

255258
def run_instrument_deploy_pre_stop(self) -> None:
@@ -285,6 +288,10 @@ def run_setup_log_rotation(self) -> None:
285288
"""setup_log_rotation"""
286289
self._server_tasks.setup_log_rotation()
287290

291+
def run_update_journal_parser(self) -> None:
292+
"""update_journal_parser"""
293+
self._server_tasks.update_journal_parser()
294+
288295
def run_developer_update(self) -> None:
289296
"""Update all the developer tools to latest version"""
290297
self._mysql_tasks.install_mysql(force=False)
@@ -404,6 +411,10 @@ def run_vhd_post_install(self) -> None:
404411
UpgradeInstrument.run_setup_log_rotation,
405412
"setup log rotation",
406413
),
414+
"update_journal_parser": (
415+
UpgradeInstrument.run_update_journal_parser,
416+
"update journal parser",
417+
),
407418
"developer_update": (UpgradeInstrument.run_developer_update, "install latest developer tools"),
408419
"create_vhds": (
409420
UpgradeInstrument.run_vhd_creation,

installation_and_upgrade/ibex_install_utils/tasks/server_tasks.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,3 +733,10 @@ def setup_log_rotation(self) -> None:
733733
expected_return_val=0,
734734
)
735735
admin_commands.run_all()
736+
737+
@task("Update journal parser")
738+
def update_journal_parser(self) -> None:
739+
"""Update journal parser binaries."""
740+
JP_BIN_DIR = os.path.join(EPICS_PATH, "ISIS", "JournalParser", "master", "bin", "windows-x64")
741+
if os.path.isdir(JP_BIN_DIR):
742+
shutil.copytree(JP_BIN_DIR, LABVIEW_DAE_DIR)

0 commit comments

Comments
 (0)