-
Notifications
You must be signed in to change notification settings - Fork 286
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix/#2755 signaling the data source that has a problem #2953
Open
Limraj
wants to merge
37
commits into
release/2.8.0
Choose a base branch
from
fix/#2755_Signaling_the_Data_Source_that_has_a_problem
base: release/2.8.0
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Fix/#2755 signaling the data source that has a problem #2953
Limraj
wants to merge
37
commits into
release/2.8.0
from
fix/#2755_Signaling_the_Data_Source_that_has_a_problem
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Created class: DataPointUnreliableUtils; Signaling added in: * Meta Data Source; * SNMP; * HTTP Retriever; * BACnet I/P; * DNP3 (IP/Serial); Signaling use DataPointUnreliableUtils in: * Modbus IP/Serial; * Viconics; * Pachube; * MQTT/AMQP
…ing on graphical views
…ing on graphical views
- fixed feature refresh point value
…gnaling_the_Data_Source_that_has_a_problem
- DataPointUnreliableUtilsTest.java; - use methods returnToNormal and raiseEvent from DataSourceRT; - added methods: LoggingUtils.info, LoggingUtils.dataPointInfo, LoggingUtils.dataPointRtInfo, PollingDataSource.getDataPoints, EventDataSource.getDataPoints, DataSourceRT.getDataPoints;
…gnaling_the_Data_Source_that_has_a_problem
- fixed Data Source use serial port - System Exception;
- corrected terminate method for: Alpha2DataSource, Dnp3DataSource, DrStorageHt5bDataSource, IEC101DataSource, OPCDataSource, RadiuinoEventDataSource, RadiuinoPollingDataSource; - fixed reset unreliable HttpImageDataSourceRT when error retriever; - refactor DataPointUnreliableUtils; - fixed RuntimeManager.startDataPoint;
- added tests: InitializeDataSourceRtTest, InitializeWithErrorsDataSourceRtTest; - corrected test: DataPointUnreliableUtilsTest; - replacing class CommPortIdentifier from RXTXcomm.jar with a new class ScadaCommPortIdentifier: ASCIISerialDataSource, DrStorageHt5bDataSource, RadiuinoEventDataSource, RadiuinoPollingDataSource; - corrected signaling errors in: BACnetIPDataSourceRT, HttpReceiverDataSourceRT, ModbusDataSource, NmeaDataSourceRT, PachubeDataSourceRT, PersistentDataSourceRT, SnmpDataSourceRT, ViconicsDataSourceRT; - try catch Throwable; - change logging level from WARN to ERROR for dataSourceRtLoggingLevel, dataPointRtLoggingLevel (log4j2.xml); - refactoring DataPointUnreliableUtils; - added methods: DataPointRT.isUnreliable, DataPointRT.isSetUnreliable, DataSourceUtils.checkInitialized;
- corrected test: InitializeWithErrorsDataSourceRtTest; - change type catch from IOException to Throwable;
- corrected test: InitializeWithErrorsDataSourceRtTest for VMStatDataSourceRT - update PrepareForTest annotation, if dataSourceRT instanceof VMStatDataSourceRT, for MessagingDataSourceRT with MQTT throw MessagingServiceException after invoke MessageService.open;
- fixed generate many events by ModbusDataSource; - corrected test InitializeDataSourceRtTest; - refactor InitializeDataSourceRtMockUtils;
- added class: RuntimeMockUtils
- fixed generate many events by: Pop3DataSourceRT, PachubeDataSourceRT, NmeaDataSourceRT, HttpRetrieverDataSourceRT, BACnetIPDataSourceRT, change to active events; - change logging fatal to debug level in methods: MBusDataSourceRT.initialize(), MBusDataSourceRT.terminate(); - fixed DataPointUnreliableUtilsTest, InitializeDataSourceRtTest, InitializeWithErrorsDataSourceRtTest, mocking TimeoutTask;
- corrected terminate method for: Alpha2DataSource, Dnp3DataSource, DrStorageHt5bDataSource, IEC101DataSource, OPCDataSource, RadiuinoEventDataSource, RadiuinoPollingDataSource; - fixed reset unreliable HttpImageDataSourceRT when error retriever; - refactor DataPointUnreliableUtils; - fixed RuntimeManager.startDataPoint;
- added tests: InitializeDataSourceRtTest, InitializeWithErrorsDataSourceRtTest; - corrected test: DataPointUnreliableUtilsTest; - replacing class CommPortIdentifier from RXTXcomm.jar with a new class ScadaCommPortIdentifier: ASCIISerialDataSource, DrStorageHt5bDataSource, RadiuinoEventDataSource, RadiuinoPollingDataSource; - corrected signaling errors in: BACnetIPDataSourceRT, HttpReceiverDataSourceRT, ModbusDataSource, NmeaDataSourceRT, PachubeDataSourceRT, PersistentDataSourceRT, SnmpDataSourceRT, ViconicsDataSourceRT; - try catch Throwable; - change logging level from WARN to ERROR for dataSourceRtLoggingLevel, dataPointRtLoggingLevel (log4j2.xml); - refactoring DataPointUnreliableUtils; - added methods: DataPointRT.isUnreliable, DataPointRT.isSetUnreliable, DataSourceUtils.checkInitialized;
- corrected test: InitializeWithErrorsDataSourceRtTest; - change type catch from IOException to Throwable;
- corrected test: InitializeWithErrorsDataSourceRtTest for VMStatDataSourceRT - update PrepareForTest annotation, if dataSourceRT instanceof VMStatDataSourceRT, for MessagingDataSourceRT with MQTT throw MessagingServiceException after invoke MessageService.open;
- fixed generate many events by ModbusDataSource; - corrected test InitializeDataSourceRtTest; - refactor InitializeDataSourceRtMockUtils;
- added class: RuntimeMockUtils
- fixed generate many events by: Pop3DataSourceRT, PachubeDataSourceRT, NmeaDataSourceRT, HttpRetrieverDataSourceRT, BACnetIPDataSourceRT, change to active events; - change logging fatal to debug level in methods: MBusDataSourceRT.initialize(), MBusDataSourceRT.terminate(); - fixed DataPointUnreliableUtilsTest, InitializeDataSourceRtTest, InitializeWithErrorsDataSourceRtTest, mocking TimeoutTask;
… of https://github.com/SCADA-LTS/Scada-LTS into fix/#2755_Signaling_the_Data_Source_that_has_a_problem
- fixed generate many events by SqlDataSourceRT;
- fixed export DrStorageHt5bDataSourceVO by removed @JsonRemoteProperty from validate method;
…_that_has_a_problem
…_that_has_a_problem
…ce_that_has_a_problem
…ce_that_has_a_problem
…gnaling_the_Data_Source_that_has_a_problem
…gnaling_the_Data_Source_that_has_a_problem
…_that_has_a_problem
- fixed updateAttemptsCounters; - test.failFast, testLogging.exceptionFormat = full;
Java Script Mocha Unit Test Results268 tests 268 ✅ 4s ⏱️ Results for commit f1811ab. ♻️ This comment has been updated with latest results. |
Java JUnit Test Results2 269 tests 2 269 ✅ 40s ⏱️ Results for commit f1811ab. ♻️ This comment has been updated with latest results. |
…_that_has_a_problem
…gnaling_the_Data_Source_that_has_a_problem # Conflicts: # webapp-resources/messages_de.properties # webapp-resources/messages_en.properties # webapp-resources/messages_es.properties # webapp-resources/messages_fi.properties # webapp-resources/messages_fr.properties # webapp-resources/messages_nl.properties # webapp-resources/messages_pt.properties # webapp-resources/messages_ru.properties # webapp-resources/messages_zh.properties
- Corrected config log4j2.xml for script: ScriptExecutor, ContextualizedScriptRT; - Added new event type DataSourcePointEventType; - Added migration V2_8_0_1__AddTypeRef3ColumnToEvents;
…_that_has_a_problem
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.