Package: zabbix / 1:4.0.4+dfsg-1

java-gateway.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
Last-Update: 2015-04-26
Forwarded: not-needed
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: debianisation of zabbix-java-gateway

--- a/src/zabbix_java/Makefile.am
+++ b/src/zabbix_java/Makefile.am
@@ -8,11 +8,11 @@
 	settings.sh \
 	shutdown.sh \
 	startup.sh
 
-ZJG = bin/zabbix-java-gateway-$(VERSION).jar
-LIB = lib/android-json-4.3_r3.1.jar:lib/logback-core-0.9.27.jar:lib/logback-classic-0.9.27.jar:lib/slf4j-api-1.6.1.jar
-JUNIT = tests/junit-4.8.2.jar
+ZJG = zabbix-java-gateway.jar
+LIB = /usr/share/java/com.android.json.jar:/usr/share/java/logback-core.jar:/usr/share/java/logback-classic.jar:/usr/share/java/slf4j-api.jar
+JUNIT = /usr/share/java/junit4.jar
 
 ZJG_DEST = $(DESTDIR)$(sbindir)/zabbix_java
 
 all: $(ZJG)
--- a/src/zabbix_java/settings.sh
+++ b/src/zabbix_java/settings.sh
@@ -1,6 +1,6 @@
 # This is a configuration file for Zabbix Java Gateway.
-# It is sourced by startup.sh and shutdown.sh scripts.
+# It is sourced by "/etc/init.d/zabbix-java-gateway".
 
 ### Option: zabbix.listenIP
 #	IP address to listen on.
 #
@@ -17,15 +17,13 @@
 # LISTEN_PORT=10052
 
 ### Option: zabbix.pidFile
 #	Name of PID file.
-#	If omitted, Zabbix Java Gateway is started as a console application.
 #
 # Mandatory: no
 # Default:
 # PID_FILE=
-
-PID_FILE="/tmp/zabbix_java.pid"
+# PID_FILE="/var/run/zabbix/zabbix_java_gateway.pid"
 
 ### Option: zabbix.startPollers
 #	Number of worker threads to start.
 #
@@ -41,7 +39,13 @@
 # Range: 1-30
 # Default:
 # TIMEOUT=3
 
+### JVM options (passed to /usr/bin/java).
+#
+# Mandatory: no
+#
+# JAVA_OPTIONS="-Xmx256m"
+
 # uncomment to enable remote monitoring of the standard JMX objects on the Zabbix Java Gateway itself
 #JAVA_OPTIONS="$JAVA_OPTIONS -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=12345
 #	-Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
--- a/src/zabbix_java/lib/logback.xml
+++ b/src/zabbix_java/lib/logback.xml
@@ -1,18 +1,18 @@
 <configuration scan="true" scanPeriod="15 seconds">
 
 	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
 
-		<file>/tmp/zabbix_java.log</file>
+		<file>/var/log/zabbix-java-gateway/zabbix_java_gateway.log</file>
 
 		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>/tmp/zabbix_java.log.%i</fileNamePattern>
+			<fileNamePattern>/var/log/zabbix-java-gateway/zabbix_java_gateway.log.%i.gz</fileNamePattern>
 			<minIndex>1</minIndex>
-			<maxIndex>3</maxIndex>
+			<maxIndex>5</maxIndex>
 		</rollingPolicy>
 
 		<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-			<maxFileSize>5MB</maxFileSize>
+			<maxFileSize>10MB</maxFileSize>
 		</triggeringPolicy>
 
 		<encoder>
 			<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>