[jira] [Comment Edited] (NIFI-51) Only require remote secure flag (site to site) when port is configured

[Joseph Witt (JIRA)]

    [ 
https://issues.apache.org/jira/browse/NIFI-51?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14257457#comment-14257457
 ] 

Joseph Witt edited comment on NIFI-51 at 12/23/14 8:18 PM:
-----------------------------------------------------------

<code>
diff --git 
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
 
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
index e6d67a0..bb98418 100644
--- 
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ 
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -447,10 +447,11 @@ public class FlowController implements EventAccess, 
ControllerServiceProvider, H
         rootGroup.setName(DEFAULT_ROOT_GROUP_NAME);
         instanceId = UUID.randomUUID().toString();
 
-        if (Boolean.TRUE.equals(isSiteToSiteSecure) && sslContext == null) {
-            LOG.error("Unable to create Secure Site-to-Site Listener because 
not all required Keystore/Truststore Properties are set. Site-to-Site 
functionality will be disabled until this problem is has been fixed.");
+        if (remoteInputSocketPort == null){
+            LOG.info("Not enabling Site-to-Site functionality because 
nifi.remote.input.socket.port is not set");
             externalSiteListener = null;
-        } else if (remoteInputSocketPort == null) {
+        } else if (isSiteToSiteSecure && sslContext == null) {
+            LOG.error("Unable to create Secure Site-to-Site Listener because 
not all required Keystore/Truststore Properties are set. Site-to-Site 
functionality will be disabled until this problem is has been fixed.");
             externalSiteListener = null;
         } else {
             // Register the SocketFlowFileServerProtocol as the appropriate 
resource for site-to-site Server Protocol
</code>



was (Author: joewitt):
diff --git 
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
 
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
index e6d67a0..bb98418 100644
--- 
a/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
+++ 
b/nar-bundles/framework-bundle/framework/core/src/main/java/org/apache/nifi/controller/FlowController.java
@@ -447,10 +447,11 @@ public class FlowController implements EventAccess, 
ControllerServiceProvider, H
         rootGroup.setName(DEFAULT_ROOT_GROUP_NAME);
         instanceId = UUID.randomUUID().toString();
 
-        if (Boolean.TRUE.equals(isSiteToSiteSecure) && sslContext == null) {
-            LOG.error("Unable to create Secure Site-to-Site Listener because 
not all required Keystore/Truststore Properties are set. Site-to-Site 
functionality will be disabled until this problem is has been fixed.");
+        if (remoteInputSocketPort == null){
+            LOG.info("Not enabling Site-to-Site functionality because 
nifi.remote.input.socket.port is not set");
             externalSiteListener = null;
-        } else if (remoteInputSocketPort == null) {
+        } else if (isSiteToSiteSecure && sslContext == null) {
+            LOG.error("Unable to create Secure Site-to-Site Listener because 
not all required Keystore/Truststore Properties are set. Site-to-Site 
functionality will be disabled until this problem is has been fixed.");
             externalSiteListener = null;
         } else {
             // Register the SocketFlowFileServerProtocol as the appropriate 
resource for site-to-site Server Protocol

> Only require remote secure flag (site to site) when port is configured
> ----------------------------------------------------------------------
>
>                 Key: NIFI-51
>                 URL: https://issues.apache.org/jira/browse/NIFI-51
>             Project: Apache NiFi
>          Issue Type: Bug
>          Components: Core Framework
>            Reporter: Joseph Witt
>            Priority: Minor
>             Fix For: 0.0.1
>
>
> If not using site-to-site, should not require the property to indicate 
> whether or not site-to-site is secure



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)