Skip to content

Commit

Permalink
NIFI-13665 Refactored Bootstrap and Runtime Process Handling (#9192)
Browse files Browse the repository at this point in the history
- Added BootstrapProcess main class to nifi-bootstrap
- Added HTTP Management Server to nifi-runtime for status
- Added HTTP client to nifi-bootstrap for status
- Removed TCP socket listeners from nifi-bootstrap and nifi-runtime
- Removed dump and env commands
- Removed java property from bootstrap.conf
- Removed nifi.bootstrap.listen.port from bootstrap.conf
  • Loading branch information
exceptionfactory authored Aug 26, 2024
1 parent 7945234 commit 6b6e8d6
Show file tree
Hide file tree
Showing 76 changed files with 4,100 additions and 2,580 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Arrays;
import org.apache.nifi.util.LimitingInputStream;

public class BootstrapRequestReader {
private final String secretKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.util;
package org.apache.nifi.minifi.bootstrap;

import java.io.IOException;
import java.io.InputStream;
Expand Down
7 changes: 2 additions & 5 deletions nifi-bootstrap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,17 @@ language governing permissions and limitations under the License. -->
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-utils</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-security-cert-builder</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<!-- Referenced in org.apache.nifi.NiFi -->
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties-loader</artifactId>
<version>2.0.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.bootstrap;

import org.apache.nifi.bootstrap.command.BootstrapCommand;
import org.apache.nifi.bootstrap.command.BootstrapCommandProvider;
import org.apache.nifi.bootstrap.command.CommandStatus;
import org.apache.nifi.bootstrap.command.StandardBootstrapCommandProvider;
import org.apache.nifi.bootstrap.configuration.ApplicationClassName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* Bootstrap Process responsible for reading configuration and maintaining application status
*/
public class BootstrapProcess {
/**
* Start Application
*
* @param arguments Array of arguments
*/
public static void main(final String[] arguments) {
final BootstrapCommandProvider bootstrapCommandProvider = new StandardBootstrapCommandProvider();
final BootstrapCommand bootstrapCommand = bootstrapCommandProvider.getBootstrapCommand(arguments);
run(bootstrapCommand);
}

private static void run(final BootstrapCommand bootstrapCommand) {
bootstrapCommand.run();
final CommandStatus commandStatus = bootstrapCommand.getCommandStatus();
if (CommandStatus.RUNNING == commandStatus) {
final Logger logger = LoggerFactory.getLogger(ApplicationClassName.BOOTSTRAP_COMMAND.getName());
logger.info("Bootstrap Process Running");
} else {
final int status = commandStatus.getStatus();
System.exit(status);
}
}
}

This file was deleted.

Loading

0 comments on commit 6b6e8d6

Please sign in to comment.