Skip to content

Conversation

@JamesKingWork
Copy link
Contributor

Description of work

On reconnect actually restart the MessageParser thread to receive messages.

Ticket

ISISComputingGroup/IBEX#5561

Acceptance criteria

Both before and after I have switched instruments and back the following occur:

  • When I send a message through the message simulator in C:\Instrument\Apps\EPICS\ISIS\IocLogServer\master\dev-tools it appears in the IOC log
  • When I trigger a log message in the DAE it appears in the DAE perspectives recent log messages

Unit tests

Give an overview of unit tests you have added or modified, if applicable. The aim is provide information to help the reviewer

System tests

Mention any automated tests or manual tests that you have added or modified, if applicable. The aim is provide information to help the reviewer

Documentation

Highlight and provide a link to any additions or changes to the documentation, if applicable. The aim is provide information to help the reviewer


Code Review

  • Is the code of an acceptable quality?
  • Do the changes function as described and is it robust?
  • Have the changes been documented in the release notes?

Final Steps

  • Reviewer has moved the release notes entry for this ticket in the "Changes merged into master" section

JamesKingWork and others added 2 commits July 21, 2020 17:13
public void closeJMSConsumer() throws JMSException {
setRunning(false);
jmsConsumer.close();

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we close () when it is receiving are we OK i.e. it throws an exception that we catch?

@FreddieAkeroyd FreddieAkeroyd merged commit b679247 into Release_7.1.0 Jul 21, 2020
@FreddieAkeroyd FreddieAkeroyd deleted the Ticket5561_fix_ioc_log branch July 21, 2020 18:37
@DominicOram DominicOram mentioned this pull request Jul 21, 2020
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants