Skip to content

Commit 0345027

Browse files
committed
Initial setup of Java-Ruby mixed environment, Gzip recover Java class implemented.
1 parent 7efad6d commit 0345027

File tree

17 files changed

+534
-16
lines changed

17 files changed

+534
-16
lines changed

.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,10 @@ vendor
55
.rakeTasks
66
.idea/*
77
*.iml
8+
*.DS_Store
9+
vendor/
10+
.bundle/
11+
build/
12+
.idea
13+
.gradle
14+
lib/logstash-output-s3_jars.rb

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
## 4.3.8
2+
- Logstash recovers corrupted gzip and uploads to S3 [#249](https://github.com/logstash-plugins/logstash-output-s3/pull/249)
3+
14
## 4.3.7
25
- Refactor: avoid usage of CHM (JRuby 9.3.4 work-around) [#248](https://github.com/logstash-plugins/logstash-output-s3/pull/248)
36

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Need help? Try #logstash on freenode IRC or the https://discuss.elastic.co/c/log
1919

2020
## Developing
2121

22-
### 1. Plugin Developement and Testing
22+
### 1. Plugin Development and Testing
2323

2424
#### Code
2525
- To get started, you'll need JRuby with the Bundler gem installed.

Rakefile

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
@files=[]
22

3-
task :default do
4-
system("rake -T")
3+
require "logstash/devutils/rake"
4+
5+
task :install_jars do
6+
sh('./gradlew clean vendor')
57
end
68

7-
require "logstash/devutils/rake"
9+
task :vendor => :install_jars
10+
11+
task :test do
12+
require 'rspec'
13+
require 'rspec/core/runner'
14+
Rake::Task[:install_jars].invoke
15+
sh './gradlew test'
16+
exit(RSpec::Core::Runner.run(Rake::FileList['spec/**/*_spec.rb']))
17+
end

VERSION

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4.3.7

build.gradle

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
import java.nio.file.Files
2+
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING
3+
4+
apply plugin: 'java'
5+
apply plugin: 'idea'
6+
apply plugin: 'maven-publish'
7+
8+
group 'org.logstash.plugins.outputs.s3'
9+
version "${new File("VERSION").text.trim()}"
10+
11+
description = "A Logstash plugin uploads events to Amazon Simple Storage Service (Amazon S3)."
12+
13+
sourceCompatibility = 1.8
14+
targetCompatibility = 1.8
15+
16+
String jacksonVersion = '2.9.10'
17+
String jacksonDatabindVersion = '2.9.10.8'
18+
19+
repositories {
20+
mavenCentral()
21+
}
22+
23+
dependencies {
24+
testImplementation 'junit:junit:4.12'
25+
testImplementation 'org.apache.logging.log4j:log4j-core:2.17.0'
26+
implementation 'org.javassist:javassist:3.24.0-GA'
27+
implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
28+
implementation "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
29+
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
30+
implementation "com.fasterxml.jackson.module:jackson-module-afterburner:${jacksonVersion}"
31+
compileOnly 'org.apache.logging.log4j:log4j-api:2.17.0'
32+
}
33+
34+
tasks.withType(JavaCompile) {
35+
options.encoding = 'UTF-8'
36+
}
37+
38+
task run (type: JavaExec, dependsOn: classes) {
39+
if (project.hasProperty('providedargs')) {
40+
args(providedargs.split(','))
41+
}
42+
classpath = sourceSets.main.runtimeClasspath
43+
}
44+
45+
task generateGemJarRequiresFile {
46+
doLast {
47+
File jars_file = file('lib/logstash-output-s3_jars.rb')
48+
jars_file.newWriter().withWriter { w ->
49+
w << "# AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.\n\n"
50+
w << "require \'jar_dependencies\'\n"
51+
configurations.runtimeClasspath.allDependencies.each {
52+
w << "require_jar(\'${it.group}\', \'${it.name}\', \'${it.version}\')\n"
53+
}
54+
w << "require_jar(\'${project.group}\', \'${project.name}\', \'${project.version}\')\n"
55+
}
56+
}
57+
}
58+
59+
task vendor {
60+
doLast {
61+
String vendorPathPrefix = "vendor/jar-dependencies"
62+
configurations.runtimeClasspath.allDependencies.each { dep ->
63+
File f = configurations.runtimeClasspath.filter { it.absolutePath.contains("${dep.group}/${dep.name}/${dep.version}") }.singleFile
64+
String groupPath = dep.group.replaceAll('\\.', '/')
65+
File newJarFile = file("${vendorPathPrefix}/${groupPath}/${dep.name}/${dep.version}/${dep.name}-${dep.version}.jar")
66+
newJarFile.mkdirs()
67+
Files.copy(f.toPath(), newJarFile.toPath(), REPLACE_EXISTING)
68+
}
69+
String projectGroupPath = project.group.replaceAll('\\.', '/')
70+
File projectJarFile = file("${vendorPathPrefix}/${projectGroupPath}/${project.name}/${project.version}/${project.name}-${project.version}.jar")
71+
projectJarFile.mkdirs()
72+
Files.copy(file("$buildDir/libs/${project.name}-${project.version}.jar").toPath(), projectJarFile.toPath(), REPLACE_EXISTING)
73+
}
74+
}
75+
76+
vendor.dependsOn(jar, generateGemJarRequiresFile)
77+
78+
publishing {
79+
publications {
80+
mavenJava(MavenPublication) {
81+
from components.java
82+
}
83+
}
84+
}

gradle/wrapper/gradle-wrapper.jar

54.3 KB
Binary file not shown.
+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

gradlew

+188
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
1+
#!/usr/bin/env sh
2+
3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
19+
##############################################################################
20+
##
21+
## Gradle start up script for UN*X
22+
##
23+
##############################################################################
24+
25+
# Attempt to set APP_HOME
26+
# Resolve links: $0 may be a link
27+
PRG="$0"
28+
# Need this for relative symlinks.
29+
while [ -h "$PRG" ] ; do
30+
ls=`ls -ld "$PRG"`
31+
link=`expr "$ls" : '.*-> \(.*\)$'`
32+
if expr "$link" : '/.*' > /dev/null; then
33+
PRG="$link"
34+
else
35+
PRG=`dirname "$PRG"`"/$link"
36+
fi
37+
done
38+
SAVED="`pwd`"
39+
cd "`dirname \"$PRG\"`/" >/dev/null
40+
APP_HOME="`pwd -P`"
41+
cd "$SAVED" >/dev/null
42+
43+
APP_NAME="Gradle"
44+
APP_BASE_NAME=`basename "$0"`
45+
46+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
48+
49+
# Use the maximum available, or set MAX_FD != -1 to use that value.
50+
MAX_FD="maximum"
51+
52+
warn () {
53+
echo "$*"
54+
}
55+
56+
die () {
57+
echo
58+
echo "$*"
59+
echo
60+
exit 1
61+
}
62+
63+
# OS specific support (must be 'true' or 'false').
64+
cygwin=false
65+
msys=false
66+
darwin=false
67+
nonstop=false
68+
case "`uname`" in
69+
CYGWIN* )
70+
cygwin=true
71+
;;
72+
Darwin* )
73+
darwin=true
74+
;;
75+
MINGW* )
76+
msys=true
77+
;;
78+
NONSTOP* )
79+
nonstop=true
80+
;;
81+
esac
82+
83+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
84+
85+
# Determine the Java command to use to start the JVM.
86+
if [ -n "$JAVA_HOME" ] ; then
87+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
88+
# IBM's JDK on AIX uses strange locations for the executables
89+
JAVACMD="$JAVA_HOME/jre/sh/java"
90+
else
91+
JAVACMD="$JAVA_HOME/bin/java"
92+
fi
93+
if [ ! -x "$JAVACMD" ] ; then
94+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
95+
96+
Please set the JAVA_HOME variable in your environment to match the
97+
location of your Java installation."
98+
fi
99+
else
100+
JAVACMD="java"
101+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
102+
103+
Please set the JAVA_HOME variable in your environment to match the
104+
location of your Java installation."
105+
fi
106+
107+
# Increase the maximum file descriptors if we can.
108+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
109+
MAX_FD_LIMIT=`ulimit -H -n`
110+
if [ $? -eq 0 ] ; then
111+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
112+
MAX_FD="$MAX_FD_LIMIT"
113+
fi
114+
ulimit -n $MAX_FD
115+
if [ $? -ne 0 ] ; then
116+
warn "Could not set maximum file descriptor limit: $MAX_FD"
117+
fi
118+
else
119+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
120+
fi
121+
fi
122+
123+
# For Darwin, add options to specify how the application appears in the dock
124+
if $darwin; then
125+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
126+
fi
127+
128+
# For Cygwin or MSYS, switch paths to Windows format before running java
129+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
132+
JAVACMD=`cygpath --unix "$JAVACMD"`
133+
134+
# We build the pattern for arguments to be converted via cygpath
135+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
136+
SEP=""
137+
for dir in $ROOTDIRSRAW ; do
138+
ROOTDIRS="$ROOTDIRS$SEP$dir"
139+
SEP="|"
140+
done
141+
OURCYGPATTERN="(^($ROOTDIRS))"
142+
# Add a user-defined pattern to the cygpath arguments
143+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
144+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
145+
fi
146+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
147+
i=0
148+
for arg in "$@" ; do
149+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
150+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
151+
152+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
153+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
154+
else
155+
eval `echo args$i`="\"$arg\""
156+
fi
157+
i=$((i+1))
158+
done
159+
case $i in
160+
(0) set -- ;;
161+
(1) set -- "$args0" ;;
162+
(2) set -- "$args0" "$args1" ;;
163+
(3) set -- "$args0" "$args1" "$args2" ;;
164+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
165+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
166+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
167+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
168+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
169+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
170+
esac
171+
fi
172+
173+
# Escape application args
174+
save () {
175+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
176+
echo " "
177+
}
178+
APP_ARGS=$(save "$@")
179+
180+
# Collect all arguments for the java command, following the shell quoting and substitution rules
181+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
182+
183+
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
184+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
185+
cd "$(dirname "$0")"
186+
fi
187+
188+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)