Skip to content

Multiple properties files #25

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.

Sign up for GitHub

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Multiple properties files #25

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a4c8ed
Updated to v1.7.2 of the amazon-kinesis-client
Nov 16, 2016
85ed530
Allow for multiple property files to be specified in the bootstrap ar…
Nov 16, 2016
53acf54
Merge remote-tracking branch 'awslabs/master' into multi-props
Nov 23, 2016
847f937
Merge remote-tracking branch 'awslabs/master' into multi-props
Jul 6, 2017
a2fe8f9
Updated kcl version to 1.7.6
Jul 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 40 additions & 26 deletions bin/kcl-bootstrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ var MAVEN_PACKAGE_LIST = [
getMavenPackageInfo('commons-logging', 'commons-logging', '1.1.3'),
getMavenPackageInfo('commons-lang', 'commons-lang', '2.6'),
getMavenPackageInfo('joda-time', 'joda-time', '2.8.1'),
getMavenPackageInfo('com.amazonaws', 'aws-java-sdk-core', '1.11.14'),
getMavenPackageInfo('com.amazonaws', 'aws-java-sdk-cloudwatch', '1.11.14'),
getMavenPackageInfo('com.amazonaws', 'aws-java-sdk-dynamodb', '1.11.14'),
getMavenPackageInfo('com.amazonaws', 'aws-java-sdk-kinesis', '1.11.14'),
getMavenPackageInfo('com.amazonaws', 'aws-java-sdk-kms', '1.11.14'),
getMavenPackageInfo('com.amazonaws', 'aws-java-sdk-s3', '1.11.14'),
getMavenPackageInfo('com.amazonaws', 'amazon-kinesis-client', '1.7.2'),
getMavenPackageInfo('com.amazonaws', 'aws-java-sdk-core', '1.11.151'),
getMavenPackageInfo('com.amazonaws', 'aws-java-sdk-cloudwatch', '1.11.151'),
getMavenPackageInfo('com.amazonaws', 'aws-java-sdk-dynamodb', '1.11.151'),
getMavenPackageInfo('com.amazonaws', 'aws-java-sdk-kinesis', '1.11.151'),
getMavenPackageInfo('com.amazonaws', 'aws-java-sdk-kms', '1.11.151'),
getMavenPackageInfo('com.amazonaws', 'aws-java-sdk-s3', '1.11.151'),
getMavenPackageInfo('com.amazonaws', 'amazon-kinesis-client', '1.7.6'),
getMavenPackageInfo('com.fasterxml.jackson.core', 'jackson-databind', '2.6.6'),
getMavenPackageInfo('com.fasterxml.jackson.core', 'jackson-core', '2.6.6'),
getMavenPackageInfo('com.fasterxml.jackson.core', 'jackson-annotations', '2.6.0'),
Expand Down Expand Up @@ -67,25 +67,27 @@ function bootstrap() {

function parseArguments() {
program
.option('-p, --properties <properties file>', 'properties file with multi-language daemon options')
.option('-p, --properties <properties files>', 'properties files (separated by commas) with multi-language daemon options')
.option('-j, --java [java path]', 'path to java executable - defaults to using JAVA_HOME environment variable to get java path (optional)')
.option('-c, --jar-path [jar path]', 'path where all multi-language daemon jar files will be downloaded (optional)')
.option('-e, --execute', 'execute the KCL application')
.parse(process.argv);

var args = {
'properties': program.properties,
'properties': program.properties.split(','),
'java': (program.java ? program.java : (process.env.JAVA_HOME ? path.join(process.env.JAVA_HOME, 'bin', 'java') : null)),
'jarPath': (program.jarPath ? program.jarPath : DEFAULT_JAR_PATH),
'execute': program.execute
};

if (!args.properties) {
if (!args.properties && args.properties.length < 1) {
invalidInvocationExit(program, 'Specify a valid --properties value.', true);
}
if (!isFile(args.properties)) {
invalidInvocationExit(program, args.properties + ' file does not exist. Specify a valid --properties value.', true);
}
args.properties.forEach(function (propFile) {
if (!isFile(propFile)) {
invalidInvocationExit(program, propFile + ' file does not exist. Specify a valid --properties value.', true);
}
});
if (!isFile(args.java)) {
invalidInvocationExit(program, 'Valid --java value is required or alternatively JAVA_HOME environment variable must be set.', true);
}
Expand All @@ -99,21 +101,33 @@ function parseArguments() {
}

function startKinesisClientLibraryApplication(options) {
var classpath = getClasspath(options).join(getPathDelimiter());
var java = options.java;
var args = ['-cp', classpath, MULTI_LANG_DAEMON_CLASS, options.properties];
var cmd = java + ' ' + args.join(' ');

console.log("==========================================================");
console.log(cmd);
console.log("==========================================================");
if (options.execute) {
console.log("Starting Multi-Lang Daemon ...");
spawn(java, args, { stdio: 'inherit' });
}
options.properties.forEach(function (propFile, index) {
var classpath = getClasspath(options, propFile).join(getPathDelimiter());
var args = ['-cp', classpath, MULTI_LANG_DAEMON_CLASS, propFile];
var cmd = java + ' ' + args.join(' ');

console.log('( ' + index + ' ) ==========================================================');
console.log('( ' + index + ' ) ' + cmd);
console.log('( ' + index + ' ) ==========================================================');
if (options.execute) {
console.log('( ' + index + ' ) Starting Multi-Lang Daemon ...');
// var p = spawn(java, args, { stdio: 'inherit' }); // defining stdio, makes stdout/err null
var p = spawn(java, args);
p.stdout.on('data', function (data) {
console.log('(' + index + ') ' + data);
});
p.stderr.on('data', function (data) {
console.log('(' + index + ') ' + data);
});
p.on('close', function (code) {
console.log('(' + index + ') Multi-Lang Daemon exited with code: ' + code);
});
}
});
}

function getClasspath(options) {
function getClasspath(options, propFile) {
var classpath = [];
fs.readdirSync(options.jarPath).map(function (file) {
return path.join(options.jarPath, file);
Expand All @@ -123,7 +137,7 @@ function getClasspath(options) {
classpath.push(path.resolve(file));
});
classpath.push(path.resolve('.'));
classpath.push(path.dirname(path.resolve(options.properties)));
classpath.push(path.dirname(path.resolve(propFile)));
return classpath;
}

Expand Down