Merge pull request #129 from IBMStreams/develop

1.7.4
IBMStreams · May 16, 2018 · e76e236 · e76e236
2 parents 600a130 + c3787a5
commit e76e236
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/....streamsx.monitoring/impl/java/src/com/ibm/streamsx/monitoring/jmx/AbstractJmxSource.java b/....streamsx.monitoring/impl/java/src/com/ibm/streamsx/monitoring/jmx/AbstractJmxSource.java
@@ -439,7 +439,7 @@ protected void setupJMXConnection() throws Exception {
 		}
 		if (iamApiKey == null) {
 			if (user == null) {
-				throw new Exception(MISSING_VALUE + PARAMETER_USER);
+				throw new Exception(MISSING_VALUE + PARAMETER_USER + " or " + PARAMETER_IAM_API_KEY);
 			}
 			if (password == null) {
 				throw new Exception(MISSING_VALUE + PARAMETER_PASSWORD);

diff --git a/...sx.monitoring/impl/java/src/com/ibm/streamsx/monitoring/jmx/internal/OperatorHandler.java b/...sx.monitoring/impl/java/src/com/ibm/streamsx/monitoring/jmx/internal/OperatorHandler.java
@@ -120,16 +120,22 @@ public void handleNotification(Notification notification, Object handback) {
 			/*
 			 * userData is the connection's object name
 			 */
-			_trace.error("notification: " + notification + ", userData=" + notification.getUserData());
+			if (_trace.isDebugEnabled()) {
+				_trace.debug("notification: " + notification + ", userData=" + notification.getUserData());
+			}
 		}
 		else if (notification.getType().equals(Notifications.OPERATOR_CONNECTION_REMOVED)) {
 			/*
 			 * userData is the connection's object name
 			 */
-			_trace.error("notification: " + notification + ", userData=" + notification.getUserData());
+			if (_trace.isDebugEnabled()) {
+				_trace.debug("notification: " + notification + ", userData=" + notification.getUserData());
+			}
 		}
 		else {
-			_trace.error("notification: " + notification + ", userData=" + notification.getUserData());
+			if (_trace.isDebugEnabled()) {
+				_trace.debug("notification: " + notification + ", userData=" + notification.getUserData());
+			}
 		}
 	}
 

diff --git a/com.ibm.streamsx.monitoring/info.xml b/com.ibm.streamsx.monitoring/info.xml
@@ -107,7 +107,7 @@ by toolkit with their namespaces as prefixes.
   **streamtool submitjob** command or by using Streams Studio. 
 
 		]]></info:description>
-		<info:version>1.7.3</info:version>
+		<info:version>1.7.4</info:version>
 		<info:requiredProductVersion>4.1.0.0</info:requiredProductVersion>
 	</info:identity>
 	<info:dependencies/>

diff --git a/tests/cloud-test/test_streaming_analytics.py b/tests/cloud-test/test_streaming_analytics.py
@@ -22,14 +22,6 @@ def setUpClass(self):
         result = service.start_instance()
         #print('Streaming Analytics service ' + connection.service_name + ' is ' + result['state'] + ' and ' + result['status'])
 
-    @classmethod
-    def tearDownClass(self):
-        # stop streams service
-        connection = sr.StreamingAnalyticsConnection()
-        service = connection.get_streaming_analytics()
-        result = service.stop_instance()
-        #print('Streaming Analytics service ' + connection.service_name + ' is ' + result['state'])
-
     def setUp(self):
         Tester.setup_streaming_analytics(self, force_remote_build=False)