fix the directory of currentpid for azkaban-*-start.sh

d0ngw · d0ngw · commit 17a54c55edd6 · 2014-02-19T23:57:04.000+08:00
add the mysql connection properties which to use utf-8 charset
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 dist/
 build/
+.idea/
+*.iml
diff --git a/src/java/azkaban/database/DataSourceUtils.java b/src/java/azkaban/database/DataSourceUtils.java
@@ -124,7 +124,7 @@ public static class MySQLBasicDataSource extends AzkabanDataSource {
 		private MySQLBasicDataSource(String host, int port, String dbName, String user, String password, int numConnections) {
 			super();
 			
-			String url = "jdbc:mysql://" + (host + ":" + port + "/" + dbName);
+			String url = "jdbc:mysql://" + (host + ":" + port + "/" + dbName+"?useUnicode=yes&characterEncoding=UTF-8");
 			setDriverClassName("com.mysql.jdbc.Driver");
 			setUsername(user);
 			setPassword(password);
diff --git a/src/package/execserver/bin/azkaban-executor-start.sh b/src/package/execserver/bin/azkaban-executor-start.sh
@@ -48,5 +48,5 @@ AZKABAN_OPTS="$AZKABAN_OPTS -server -Dcom.sun.management.jmxremote -Djava.io.tmp
 
 java $AZKABAN_OPTS $JAVA_LIB_PATH -cp $CLASSPATH azkaban.execapp.AzkabanExecutorServer -conf $azkaban_dir/conf $@ &
 
-echo $! > currentpid
+echo $! > $azkaban_dir/currentpid
 
diff --git a/src/package/soloserver/bin/azkaban-solo-start.sh b/src/package/soloserver/bin/azkaban-solo-start.sh
@@ -47,5 +47,5 @@ AZKABAN_OPTS="$AZKABAN_OPTS -server -Dcom.sun.management.jmxremote -Djava.io.tmp
 
 java $AZKABAN_OPTS -cp $CLASSPATH azkaban.webapp.AzkabanSingleServer -conf $azkaban_dir/conf $@ &
 
-echo $! > currentpid
+echo $! > $azkaban_dir/currentpid
 
diff --git a/src/package/webserver/bin/azkaban-web-start.sh b/src/package/webserver/bin/azkaban-web-start.sh
@@ -47,5 +47,5 @@ AZKABAN_OPTS="$AZKABAN_OPTS -server -Dcom.sun.management.jmxremote -Djava.io.tmp
 
 java $AZKABAN_OPTS $JAVA_LIB_PATH -cp $CLASSPATH azkaban.webapp.AzkabanWebServer -conf $azkaban_dir/conf $@ &
 
-echo $! > currentpid
+echo $! > $azkaban_dir/currentpid
 

-Original file line number
+Diff line change
@@ @@ -1,2 +1,4 @@ @@
 dist/
 build/
 +.idea/
 +*.iml
Original file line number	Diff line number	Diff line change
`@@ -48,5 +48,5 @@ AZKABAN_OPTS="$AZKABAN_OPTS -server -Dcom.sun.management.jmxremote -Djava.io.tmp`
`48`	`48`
`49`	`49`	`java $AZKABAN_OPTS $JAVA_LIB_PATH -cp $CLASSPATH azkaban.execapp.AzkabanExecutorServer -conf $azkaban_dir/conf $@ &`
`50`	`50`
`51`		`-echo $! > currentpid`
	`51`	`+echo $! > $azkaban_dir/currentpid`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,5 @@ AZKABAN_OPTS="$AZKABAN_OPTS -server -Dcom.sun.management.jmxremote -Djava.io.tmp`
`47`	`47`
`48`	`48`	`java $AZKABAN_OPTS -cp $CLASSPATH azkaban.webapp.AzkabanSingleServer -conf $azkaban_dir/conf $@ &`
`49`	`49`
`50`		`-echo $! > currentpid`
	`50`	`+echo $! > $azkaban_dir/currentpid`
`51`	`51`