diff --git a/nifi-api/src/main/java/org/apache/nifi/flow/VersionedProcessGroup.java b/nifi-api/src/main/java/org/apache/nifi/flow/VersionedProcessGroup.java index d7cfc6d9b847..c6ee435f5d87 100644 --- a/nifi-api/src/main/java/org/apache/nifi/flow/VersionedProcessGroup.java +++ b/nifi-api/src/main/java/org/apache/nifi/flow/VersionedProcessGroup.java @@ -47,7 +47,6 @@ public class VersionedProcessGroup extends VersionedComponent { private Long defaultBackPressureObjectThreshold; private String defaultBackPressureDataSizeThreshold; - private Boolean logToOwnFile; private String logFileSuffix; @@ -209,16 +208,7 @@ public void setDefaultBackPressureDataSizeThreshold(final String defaultBackPres this.defaultBackPressureDataSizeThreshold = defaultBackPressureDataSizeThreshold; } - @ApiModelProperty(value = "Whether dedicated logging is set for this Process Group.") - public Boolean isLogToOwnFile() { - return logToOwnFile; - } - - public void setLogToOwnFile(final Boolean logToOwnFile) { - this.logToOwnFile = logToOwnFile; - } - - @ApiModelProperty(value = "The log file suffix for this Process Group.") + @ApiModelProperty(value = "The log file suffix for this Process Group for dedicated logging.") public String getLogFileSuffix() { return logFileSuffix; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java index 7fdc57abfe50..336f5d27145e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ProcessGroupDTO.java @@ -39,7 +39,6 @@ public class ProcessGroupDTO extends ComponentDTO { private String defaultFlowFileExpiration; private Long defaultBackPressureObjectThreshold; private String defaultBackPressureDataSizeThreshold; - private Boolean logToOwnFile; private String logFileSuffix; private Integer runningCount; @@ -406,16 +405,7 @@ public void setDefaultBackPressureDataSizeThreshold(final String defaultBackPres this.defaultBackPressureDataSizeThreshold = defaultBackPressureDataSizeThreshold; } - @ApiModelProperty(value = "Whether this Process Group should log to a dedicated file.") - public Boolean isLogToOwnFile() { - return logToOwnFile; - } - - public void setLogToOwnFile(final Boolean logToOwnFile) { - this.logToOwnFile = logToOwnFile; - } - - @ApiModelProperty(value = "`Log file suffix`") + @ApiModelProperty(value = "The log file suffix for this Process Group for dedicated logging.") public String getLogFileSuffix() { return logFileSuffix; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java index 45d6ec327c87..f86de64e181a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java @@ -317,7 +317,6 @@ private void synchronize(final ProcessGroup group, final VersionedProcessGroup p group.setDefaultBackPressureObjectThreshold(proposed.getDefaultBackPressureObjectThreshold()); group.setDefaultBackPressureDataSizeThreshold(proposed.getDefaultBackPressureDataSizeThreshold()); - group.setLogToOwnFile(proposed.isLogToOwnFile()); group.setLogFileSuffix(proposed.getLogFileSuffix()); final VersionedFlowCoordinates remoteCoordinates = proposed.getVersionedFlowCoordinates(); @@ -1798,7 +1797,6 @@ public void synchronizeProcessGroupSettings(final ProcessGroup processGroup, fin groupToUpdate.setComments(proposed.getComments()); groupToUpdate.setName(proposed.getName()); groupToUpdate.setPosition(new Position(proposed.getPosition().getX(), proposed.getPosition().getY())); - groupToUpdate.setLogToOwnFile(proposed.isLogToOwnFile()); groupToUpdate.setLogFileSuffix(proposed.getLogFileSuffix()); if (processGroup == null) { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java index 27a45b53c636..816ee9d784e5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java @@ -214,8 +214,7 @@ public final class StandardProcessGroup implements ProcessGroup { private static final String DEFAULT_FLOWFILE_EXPIRATION = "0 sec"; private static final long DEFAULT_BACKPRESSURE_OBJECT = 10_000L; private static final String DEFAULT_BACKPRESSURE_DATA_SIZE = "1 GB"; - - private volatile Boolean logToOwnFile = Boolean.FALSE; + private static final String VALID_DIRECTORY_NAME_REGEX = "[\\s\\<\\>:\\'\\\"\\/\\\\\\|\\?\\*]"; private volatile String logFileSuffix; @@ -247,7 +246,7 @@ public StandardProcessGroup(final String id, final ControllerServiceProvider ser this.defaultFlowFileExpiration = new AtomicReference<>(); this.defaultBackPressureObjectThreshold = new AtomicReference<>(); this.defaultBackPressureDataSizeThreshold = new AtomicReference<>(); - this.logFileSuffix = getName(); + this.logFileSuffix = null; // save only the nifi properties needed, and account for the possibility those properties are missing if (nifiProperties == null) { @@ -4426,16 +4425,6 @@ public QueueSize getQueueSize() { return new QueueSize(count, contentSize); } - @Override - public Boolean isLogToOwnFile() { - return logToOwnFile; - } - - @Override - public void setLogToOwnFile(final Boolean logToOwnFile) { - this.logToOwnFile = logToOwnFile; - } - @Override public String getLogFileSuffix() { return logFileSuffix; @@ -4443,7 +4432,12 @@ public String getLogFileSuffix() { @Override public void setLogFileSuffix(final String logFileSuffix) { - this.logFileSuffix = logFileSuffix; + final Pattern pattern = Pattern.compile(VALID_DIRECTORY_NAME_REGEX); + if (logFileSuffix != null && pattern.matcher(logFileSuffix).find()) { + throw new IllegalArgumentException("Log file suffix can not contain the following characters: space, <, >, :, \', \", /, \\, |, ?, *"); + } else { + this.logFileSuffix = logFileSuffix; + } } @Override diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/logging/LoggingContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/logging/LoggingContext.java index 62e5ded2b9a3..1a43174d20bd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/logging/LoggingContext.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/logging/LoggingContext.java @@ -19,6 +19,13 @@ import java.util.Optional; public interface LoggingContext { + /** + * @return the log file name suffix. This will be the discriminating value for the dedicated logging. + */ Optional getLogFileSuffix(); + + /** + * @return The key under which the discriminating value should be exported into the host environment. + */ String getDiscriminatorKey(); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/logging/StandardLoggingContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/logging/StandardLoggingContext.java index d28a9df26b99..213e9c7d2632 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/logging/StandardLoggingContext.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/logging/StandardLoggingContext.java @@ -24,9 +24,9 @@ public class StandardLoggingContext implements LoggingContext { private static final String KEY = "logFileSuffix"; - private volatile PerProcessGroupLoggable component; + private volatile GroupedComponent component; - public StandardLoggingContext(final PerProcessGroupLoggable component) { + public StandardLoggingContext(final GroupedComponent component) { this.component = component; } @@ -47,7 +47,7 @@ public String getDiscriminatorKey() { private Optional getSuffix(final ProcessGroup group) { if (group == null) { return Optional.empty(); - } else if (group.isLogToOwnFile()) { + } else if (group.getLogFileSuffix() != null) { return Optional.of(group.getLogFileSuffix()); } else if (group.isRootGroup()) { return Optional.empty(); @@ -56,7 +56,7 @@ private Optional getSuffix(final ProcessGroup group) { } } - public void setComponent(final PerProcessGroupLoggable component) { + public void setComponent(final GroupedComponent component) { this.component = component; } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/StandardFlowRegistryClientNode.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/StandardFlowRegistryClientNode.java index cf216687d1ad..c5a8f9164902 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/StandardFlowRegistryClientNode.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/StandardFlowRegistryClientNode.java @@ -327,7 +327,6 @@ private void populateVersionedContentsRecursively(final FlowRegistryClientUserCo group.setDefaultFlowFileExpiration(contents.getDefaultFlowFileExpiration()); group.setDefaultBackPressureObjectThreshold(contents.getDefaultBackPressureObjectThreshold()); group.setDefaultBackPressureDataSizeThreshold(contents.getDefaultBackPressureDataSizeThreshold()); - group.setLogToOwnFile(contents.isLogToOwnFile()); group.setLogFileSuffix(contents.getLogFileSuffix()); coordinates.setLatest(snapshot.isLatest()); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java index 0b25a54cb8db..92205ee79523 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/registry/flow/mapping/NiFiRegistryFlowMapper.java @@ -258,7 +258,6 @@ private InstantiatedVersionedProcessGroup mapGroup(final ProcessGroup group, fin versionedGroup.setDefaultFlowFileExpiration(group.getDefaultFlowFileExpiration()); versionedGroup.setDefaultBackPressureObjectThreshold(group.getDefaultBackPressureObjectThreshold()); versionedGroup.setDefaultBackPressureDataSizeThreshold(group.getDefaultBackPressureDataSizeThreshold()); - versionedGroup.setLogToOwnFile(group.isLogToOwnFile()); versionedGroup.setLogFileSuffix(group.getLogFileSuffix()); final ParameterContext parameterContext = group.getParameterContext(); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java index ad2fa76122e6..ec710b10d263 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/util/FlowDifferenceFilters.java @@ -74,7 +74,8 @@ public static boolean isEnvironmentalChange(final FlowDifference difference, fin || isNewZIndexLabelConfigWithDefaultValue(difference, flowManager) || isNewZIndexConnectionConfigWithDefaultValue(difference, flowManager) || isRegistryUrlChange(difference) - || isParameterContextChange(difference); + || isParameterContextChange(difference) + || isLogFileSuffixChange(difference); } private static boolean isSensitivePropertyDueToGhosting(final FlowDifference difference, final FlowManager flowManager) { @@ -529,4 +530,8 @@ private static boolean hasConnection(final VersionedProcessGroup processGroup, f private static boolean isParameterContextChange(final FlowDifference flowDifference) { return flowDifference.getDifferenceType() == DifferenceType.PARAMETER_CONTEXT_CHANGED; } + + private static boolean isLogFileSuffixChange(final FlowDifference flowDifference) { + return flowDifference.getDifferenceType() == DifferenceType.LOG_FILE_SUFFIX_CHANGED; + } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/logging/TestStandardLoggingContext.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/logging/TestStandardLoggingContext.java index 345e31690f82..a6ff4a4dd30f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/logging/TestStandardLoggingContext.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/test/java/org/apache/nifi/logging/TestStandardLoggingContext.java @@ -28,10 +28,10 @@ @ExtendWith(MockitoExtension.class) class TestStandardLoggingContext { - private static final String LOG_FILE_Suffix = "myGroup"; + private static final String LOG_FILE_SUFFIX = "myGroup"; @Mock - private PerProcessGroupLoggable processor; + private GroupedComponent processor; @Mock private ProcessGroup processGroup; @@ -48,7 +48,7 @@ void testComponentWithProcessGroups_WithoutPerProcessGroupLogging_ShouldReturnOp //component with pg with no setting returns optional empty LoggingContext context = new StandardLoggingContext(processor); when(processor.getProcessGroup()).thenReturn(processGroup); - when(processGroup.isLogToOwnFile()).thenReturn(Boolean.FALSE, Boolean.FALSE); + when(processGroup.getLogFileSuffix()).thenReturn(null, null); when(processGroup.isRootGroup()).thenReturn(Boolean.FALSE, Boolean.TRUE); when(processGroup.getParent()).thenReturn(processGroup); @@ -59,21 +59,19 @@ void testComponentWithProcessGroups_WithoutPerProcessGroupLogging_ShouldReturnOp void testComponentWithProcessGroup_WithPerProcessGroupLogging_ShouldReturnLogFileSuffix() { LoggingContext context = new StandardLoggingContext(processor); when(processor.getProcessGroup()).thenReturn(processGroup); - when(processGroup.isLogToOwnFile()).thenReturn(Boolean.TRUE); - when(processGroup.getLogFileSuffix()).thenReturn(LOG_FILE_Suffix); + when(processGroup.getLogFileSuffix()).thenReturn(LOG_FILE_SUFFIX); - assertEquals(LOG_FILE_Suffix, context.getLogFileSuffix().orElse(null)); + assertEquals(LOG_FILE_SUFFIX, context.getLogFileSuffix().orElse(null)); } @Test void testComponentWithProcessGroups_WithPerProcessGroupLoggingSetOnParent_ShouldReturnLogFileSuffix() { LoggingContext context = new StandardLoggingContext(processor); when(processor.getProcessGroup()).thenReturn(processGroup); - when(processGroup.isLogToOwnFile()).thenReturn(Boolean.FALSE, Boolean.TRUE); when(processGroup.isRootGroup()).thenReturn(Boolean.FALSE); when(processGroup.getParent()).thenReturn(processGroup); - when(processGroup.getLogFileSuffix()).thenReturn(LOG_FILE_Suffix); + when(processGroup.getLogFileSuffix()).thenReturn(null, LOG_FILE_SUFFIX); - assertEquals(LOG_FILE_Suffix, context.getLogFileSuffix().orElse(null)); + assertEquals(LOG_FILE_SUFFIX, context.getLogFileSuffix().orElse(null)); } } \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/connectable/Connectable.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/connectable/Connectable.java index fd53c027f0f9..4ee4fa4f1b0e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/connectable/Connectable.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/connectable/Connectable.java @@ -22,7 +22,7 @@ import org.apache.nifi.controller.BackoffMechanism; import org.apache.nifi.controller.Triggerable; import org.apache.nifi.groups.ProcessGroup; -import org.apache.nifi.logging.PerProcessGroupLoggable; +import org.apache.nifi.logging.GroupedComponent; import org.apache.nifi.processor.ProcessSession; import org.apache.nifi.processor.Relationship; import org.apache.nifi.scheduling.SchedulingStrategy; @@ -35,7 +35,7 @@ /** * Represents a connectable component to which or from which data can flow. */ -public interface Connectable extends Triggerable, ComponentAuthorizable, Positionable, VersionedComponent, PerProcessGroupLoggable { +public interface Connectable extends Triggerable, ComponentAuthorizable, Positionable, VersionedComponent, GroupedComponent { /** * @return the unique identifier for this Connectable diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java index a7c89651b875..42a134eeb4c9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/controller/service/ControllerServiceNode.java @@ -27,7 +27,7 @@ import org.apache.nifi.groups.ProcessGroup; import org.apache.nifi.logging.ComponentLog; import org.apache.nifi.logging.LogLevel; -import org.apache.nifi.logging.PerProcessGroupLoggable; +import org.apache.nifi.logging.GroupedComponent; import org.apache.nifi.nar.ExtensionManager; import java.util.List; @@ -37,7 +37,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -public interface ControllerServiceNode extends ComponentNode, VersionedComponent, PerProcessGroupLoggable { +public interface ControllerServiceNode extends ComponentNode, VersionedComponent, GroupedComponent { /** * @return the Process Group that this Controller Service belongs to, or null if the Controller Service diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java index 94a789ac665f..e48f08ea2afc 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/groups/ProcessGroup.java @@ -1235,24 +1235,12 @@ public interface ProcessGroup extends ComponentAuthorizable, Positionable, Versi QueueSize getQueueSize(); /** - * @return whether dedicated logging is set for the ProcessGroup - */ - Boolean isLogToOwnFile(); - - /** - * Updates logging setting of this ProcessGroup. - * - * @param logToOwnFile new logging setting value - */ - void setLogToOwnFile(Boolean logToOwnFile); - - /** - * @return the log file suffix of the ProcessGroup + * @return the log file suffix of the ProcessGroup for dedicated logging */ String getLogFileSuffix(); /** - * Updates the log file suffix of this ProcessGroup. + * Updates the log file suffix of this ProcessGroup for dedicated logging * * @param logFileSuffix new log file suffix */ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/PerProcessGroupLoggable.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/GroupedComponent.java similarity index 95% rename from nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/PerProcessGroupLoggable.java rename to nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/GroupedComponent.java index c4736dfd866d..342165c16829 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/PerProcessGroupLoggable.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core-api/src/main/java/org/apache/nifi/logging/GroupedComponent.java @@ -18,6 +18,6 @@ import org.apache.nifi.groups.ProcessGroup; -public interface PerProcessGroupLoggable { +public interface GroupedComponent { ProcessGroup getProcessGroup(); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSnippet.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSnippet.java index 41f58a49b972..ecfbdbbb0585 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSnippet.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSnippet.java @@ -533,14 +533,11 @@ public void instantiate(final FlowManager flowManager, final FlowController flow childGroup.setDefaultBackPressureDataSizeThreshold(defaultBackPressureDataSizeThreshold); } - final Boolean logToOwnFile = groupDTO.isLogToOwnFile(); - if (logToOwnFile != null) { - childGroup.setLogToOwnFile(logToOwnFile); + final String logFileSuffix = groupDTO.getLogFileSuffix(); + if (logFileSuffix != null) { + childGroup.setLogFileSuffix(logFileSuffix); } - //To avoid log file name conflict we default the log file suffix to the Process Group's name. - childGroup.setLogFileSuffix(groupDTO.getName()); - // If this Process Group is 'top level' then we do not set versioned component ID's. // We do this only if this component is the child of a Versioned Component. if (!topLevel) { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/XmlFlowSynchronizer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/XmlFlowSynchronizer.java index 5b607a6c52e4..ddb86cfafb8e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/XmlFlowSynchronizer.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/XmlFlowSynchronizer.java @@ -1292,7 +1292,6 @@ private void updateProcessGroup(final ProcessGroup group, final ProcessGroupDTO final String defaultFlowFileExpiration = dto.getDefaultFlowFileExpiration(); final Long defaultBackPressureObjectThreshold = dto.getDefaultBackPressureObjectThreshold(); final String defaultBackPressureDataSizeThreshold = dto.getDefaultBackPressureDataSizeThreshold(); - final Boolean logToOwnFile = dto.isLogToOwnFile(); final String logFileSuffix = dto.getLogFileSuffix(); if (name != null) { @@ -1336,10 +1335,6 @@ private void updateProcessGroup(final ProcessGroup group, final ProcessGroupDTO group.setDefaultBackPressureDataSizeThreshold(defaultBackPressureDataSizeThreshold); } - if (logToOwnFile != null) { - group.setLogToOwnFile(logToOwnFile); - } - if (logFileSuffix != null) { group.setLogFileSuffix(logFileSuffix); } @@ -1478,7 +1473,6 @@ private ProcessGroup addProcessGroup(final FlowController controller, final Proc processGroup.setDefaultBackPressureObjectThreshold(processGroupDTO.getDefaultBackPressureObjectThreshold()); processGroup.setDefaultBackPressureDataSizeThreshold(processGroupDTO.getDefaultBackPressureDataSizeThreshold()); - processGroup.setLogToOwnFile(processGroupDTO.isLogToOwnFile()); processGroup.setLogFileSuffix(processGroupDTO.getLogFileSuffix()); final String parameterContextId = getString(processGroupElement, "parameterContextId"); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/FlowFromDOMFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/FlowFromDOMFactory.java index e8f324653ca4..9471f7bc32cb 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/FlowFromDOMFactory.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/FlowFromDOMFactory.java @@ -296,7 +296,6 @@ public static ProcessGroupDTO getProcessGroup(final String parentId, final Eleme dto.setDefaultFlowFileExpiration(getString(element, "defaultFlowFileExpiration")); dto.setDefaultBackPressureObjectThreshold(getLong(element, "defaultBackPressureObjectThreshold")); dto.setDefaultBackPressureDataSizeThreshold(getString(element, "defaultBackPressureDataSizeThreshold")); - dto.setLogToOwnFile(getBoolean(element, "logToOwnFile")); dto.setLogFileSuffix(getString(element, "logFileSuffix")); final Map variables = new HashMap<>(); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/StandardFlowSerializer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/StandardFlowSerializer.java index 5fb0687e8855..d758b3094dbb 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/StandardFlowSerializer.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/serialization/StandardFlowSerializer.java @@ -256,7 +256,6 @@ private void addProcessGroup(final Element parentElement, final ProcessGroup gro addTextElement(element, "defaultFlowFileExpiration", group.getDefaultFlowFileExpiration()); addTextElement(element, "defaultBackPressureObjectThreshold", group.getDefaultBackPressureObjectThreshold()); addTextElement(element, "defaultBackPressureDataSizeThreshold", group.getDefaultBackPressureDataSizeThreshold()); - addTextElement(element, "logToOwnFile", String.valueOf(group.isLogToOwnFile())); addTextElement(element, "logFileSuffix", group.getLogFileSuffix()); final VersionControlInformation versionControlInfo = group.getVersionControlInformation(); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java index 8a5ffcbd021d..ba7bd2483e1a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java @@ -392,7 +392,6 @@ StringBuilder addProcessGroupFingerprint(final StringBuilder builder, final Elem appendFirstValue(builder, DomUtils.getChildNodesByTagName(processGroupElem, "defaultFlowFileExpiration")); appendFirstValue(builder, DomUtils.getChildNodesByTagName(processGroupElem, "defaultBackPressureObjectThreshold")); appendFirstValue(builder, DomUtils.getChildNodesByTagName(processGroupElem, "defaultBackPressureDataSizeThreshold")); - appendFirstValue(builder, DomUtils.getChildNodesByTagName(processGroupElem, "logToOwnFile")); appendFirstValue(builder, DomUtils.getChildNodesByTagName(processGroupElem, "logFileSuffix")); final Element versionControlInfo = DomUtils.getChild(processGroupElem, "versionControlInformation"); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd index b2d0cd0fa5bb..1f5bacf7995d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/resources/FlowConfiguration.xsd @@ -207,7 +207,6 @@ - @@ -275,7 +274,6 @@ - diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/mock/MockProcessGroup.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/mock/MockProcessGroup.java index 1edf4f0df00a..427b9930ca1f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/mock/MockProcessGroup.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/service/mock/MockProcessGroup.java @@ -858,19 +858,9 @@ public QueueSize getQueueSize() { return null; } - @Override - public Boolean isLogToOwnFile() { - return Boolean.FALSE; - } - - @Override - public void setLogToOwnFile(Boolean logToOwnFile) { - - } - @Override public String getLogFileSuffix() { - return getName(); + return null; } @Override diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml index 0fe1fb4babb6..dc1db9608dd5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/logback.xml @@ -101,7 +101,7 @@ - + @@ -252,7 +252,7 @@ - + diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java index df058c324210..ea26fdd22c8d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java @@ -2686,7 +2686,6 @@ private ProcessGroupDTO createConciseProcessGroupDto(final ProcessGroup group) { dto.setDefaultFlowFileExpiration(group.getDefaultFlowFileExpiration()); dto.setDefaultBackPressureObjectThreshold(group.getDefaultBackPressureObjectThreshold()); dto.setDefaultBackPressureDataSizeThreshold(group.getDefaultBackPressureDataSizeThreshold()); - dto.setLogToOwnFile(group.isLogToOwnFile()); dto.setLogFileSuffix(group.getLogFileSuffix()); final ParameterContext parameterContext = group.getParameterContext(); @@ -4601,7 +4600,6 @@ public ProcessGroupDTO copy(final ProcessGroupDTO original, final boolean deep) copy.setDefaultFlowFileExpiration(original.getDefaultFlowFileExpiration()); copy.setDefaultBackPressureObjectThreshold(original.getDefaultBackPressureObjectThreshold()); copy.setDefaultBackPressureDataSizeThreshold(original.getDefaultBackPressureDataSizeThreshold()); - copy.setLogToOwnFile(original.isLogToOwnFile()); copy.setLogFileSuffix(original.getLogFileSuffix()); copy.setRunningCount(original.getRunningCount()); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessGroupDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessGroupDAO.java index 5615be5acf90..ecfe35e2a29a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessGroupDAO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/impl/StandardProcessGroupDAO.java @@ -347,7 +347,6 @@ public ProcessGroup updateProcessGroup(ProcessGroupDTO processGroupDTO) { final Long defaultBackPressureObjectThreshold = processGroupDTO.getDefaultBackPressureObjectThreshold(); final String defaultBackPressureDataSizeThreshold = processGroupDTO.getDefaultBackPressureDataSizeThreshold(); - final Boolean logToOwnFile = processGroupDTO.isLogToOwnFile(); final String logFileSuffix = processGroupDTO.getLogFileSuffix(); final ParameterContextReferenceEntity parameterContextReference = processGroupDTO.getParameterContext(); @@ -395,11 +394,6 @@ public ProcessGroup updateProcessGroup(ProcessGroupDTO processGroupDTO) { group.setDefaultBackPressureDataSizeThreshold(processGroupDTO.getDefaultBackPressureDataSizeThreshold()); } - if (logToOwnFile != null) { - group.setLogToOwnFile(logToOwnFile); - } - - if (logFileSuffix != null) { group.setLogFileSuffix(logFileSuffix); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java index d4ebcc06c4a9..9b183193d100 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/util/SnippetUtils.java @@ -461,6 +461,28 @@ private void resolveNameConflicts(final FlowSnippetDTO snippetContents, final Pr groupNames.add(groupDTO.getName()); } } + + // get a list of all log file suffix + final List existingLogFileSuffixes = new ArrayList<>(); + for (final ProcessGroup processGroup : group.getProcessGroups()) { + if (processGroup.getLogFileSuffix() != null) { + existingLogFileSuffixes.add(processGroup.getLogFileSuffix()); + } + } + + // rename log file suffixes + if (snippetContents.getProcessGroups() != null) { + for (final ProcessGroupDTO processGroupDTO : snippetContents.getProcessGroups()) { + String logFileSuffix = processGroupDTO.getLogFileSuffix(); + if (logFileSuffix != null) { + while (existingLogFileSuffixes.contains(logFileSuffix)) { + logFileSuffix = "Copy_of_" + logFileSuffix; + } + processGroupDTO.setLogFileSuffix(logFileSuffix); + existingLogFileSuffixes.add(processGroupDTO.getLogFileSuffix()); + } + } + } } private FlowSnippetDTO copyContentsForGroup(final FlowSnippetDTO snippetContents, final String groupId, final Map parentConnectableMap, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp index 3631d33915d4..dbb0687ef389 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp @@ -100,16 +100,9 @@
-
Log to own file?
-
-
-
-
- -
-
-
-
Log File Suffix
+
Log File Suffix +
+
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js index 93b2d05f1386..d2c9fb289ce0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js @@ -112,7 +112,6 @@ 'defaultFlowFileExpiration': $('#process-group-default-flowfile-expiration').val(), 'defaultBackPressureObjectThreshold': $('#process-group-default-back-pressure-object-threshold').val(), 'defaultBackPressureDataSizeThreshold': $('#process-group-default-back-pressure-data-size-threshold').val(), - 'logToOwnFile': $('#process-group-log-to-own-file-combo').combo('getSelectedOption').value, 'logFileSuffix': $('#process-group-log-file-suffix').val() } }; @@ -273,26 +272,7 @@ $('#process-group-default-flowfile-expiration').removeClass('unset').val(processGroup.defaultFlowFileExpiration); $('#process-group-default-back-pressure-object-threshold').removeClass('unset').val(processGroup.defaultBackPressureObjectThreshold); $('#process-group-default-back-pressure-data-size-threshold').removeClass('unset').val(processGroup.defaultBackPressureDataSizeThreshold); - - $('#process-group-log-to-own-file-combo').removeClass('unset').combo({ - options: [{ - text: 'Yes', - value: true, - description: 'Logging will be generated to dedicated log file for the process group.' - }, { - text: 'No', - value: false, - description: 'Normal logging will be followed.' - }], - selectedOption: { - value: processGroup.logToOwnFile - } - }); - if (processGroup.logFileSuffix == null) { - $('#process-group-log-file-suffix').removeClass('unset').val(processGroup.name); - } else { - $('#process-group-log-file-suffix').removeClass('unset').val(processGroup.logFileSuffix); - } + $('#process-group-log-file-suffix').removeClass('unset').val(processGroup.logFileSuffix); // populate the header $('#process-group-configuration-header-text').text(processGroup.name + ' Configuration'); @@ -337,21 +317,7 @@ $('#read-only-process-group-default-flowfile-expiration').text(processGroup.defaultFlowFileExpiration); $('#read-only-process-group-default-back-pressure-object-threshold').text(processGroup.defaultBackPressureObjectThreshold); $('#read-only-process-group-default-back-pressure-data-size-threshold').text(processGroup.defaultBackPressureDataSizeThreshold); - - // Determine the user-friendly name for the selected Log To Own File - var selectedLogToOwnFile; - if (processGroup.logToOwnFile == true) { - selectedLogToOwnFile = "Yes"; - } else { - selectedLogToOwnFile = "No"; - } - - $('#read-only-process-group-log-to-own-file').text(selectedLogToOwnFile); - if (processGroup.logFileSuffix == null) { - $('#read-only-process-group-log-file-suffix').text(processGroup.name); - } else { - $('#read-only-process-group-log-file-suffix').text(processGroup.logFileSuffix); - } + $('#read-only-process-group-log-file-suffix').text(processGroup.logFileSuffix); } else { diff --git a/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java b/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java index c79df55b64a2..219aff464288 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java +++ b/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/DifferenceType.java @@ -370,11 +370,6 @@ public enum DifferenceType { */ DEFAULT_FLOWFILE_EXPIRATION_CHANGED("Default FlowFile Expiration Changed"), - /** - * The Process Group's Log To Own File value is different in each of the flows - */ - LOG_TO_OWN_FILE_CHANGED("Log To Own File Changed"), - /** * The Process Group's Log File Suffix value is different in each of the flows */ diff --git a/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java b/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java index 804b52398e52..be21d97069cb 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java +++ b/nifi-registry/nifi-registry-core/nifi-registry-flow-diff/src/main/java/org/apache/nifi/registry/flow/diff/StandardFlowComparator.java @@ -522,8 +522,7 @@ private void compare(final VersionedProcessGroup groupA, final VersionedProcessG addIfDifferent(differences, DifferenceType.DEFAULT_BACKPRESSURE_OBJECT_COUNT_CHANGED, groupA, groupB, VersionedProcessGroup::getDefaultBackPressureObjectThreshold, true, 10_000L); addIfDifferent(differences, DifferenceType.DEFAULT_FLOWFILE_EXPIRATION_CHANGED, groupA, groupB, VersionedProcessGroup::getDefaultFlowFileExpiration, true, "0 sec"); addIfDifferent(differences, DifferenceType.PARAMETER_CONTEXT_CHANGED, groupA, groupB, VersionedProcessGroup::getParameterContextName, true, null); - addIfDifferent(differences, DifferenceType.LOG_TO_OWN_FILE_CHANGED, groupA, groupB, VersionedProcessGroup::isLogToOwnFile, true, Boolean.FALSE); - addIfDifferent(differences, DifferenceType.LOG_FILE_SUFFIX_CHANGED, groupA, groupB, VersionedProcessGroup::getLogFileSuffix, true, groupA.getName()); + addIfDifferent(differences, DifferenceType.LOG_FILE_SUFFIX_CHANGED, groupA, groupB, VersionedProcessGroup::getLogFileSuffix, true, null); final VersionedFlowCoordinates groupACoordinates = groupA.getVersionedFlowCoordinates(); final VersionedFlowCoordinates groupBCoordinates = groupB.getVersionedFlowCoordinates(); diff --git a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/core/RegistryUtil.java b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/core/RegistryUtil.java index 4cda1c391751..1e0da7c5598e 100644 --- a/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/core/RegistryUtil.java +++ b/nifi-stateless/nifi-stateless-bundle/nifi-stateless-engine/src/main/java/org/apache/nifi/stateless/core/RegistryUtil.java @@ -155,7 +155,6 @@ private void populateVersionedContentsRecursively(final VersionedProcessGroup gr group.setDefaultFlowFileExpiration(contents.getDefaultFlowFileExpiration()); group.setDefaultBackPressureObjectThreshold(contents.getDefaultBackPressureObjectThreshold()); group.setDefaultBackPressureDataSizeThreshold(contents.getDefaultBackPressureDataSizeThreshold()); - group.setLogToOwnFile(contents.isLogToOwnFile()); group.setLogFileSuffix(contents.getLogFileSuffix()); coordinates.setLatest(snapshot.isLatest()); }