Removed EMAIL, LICENSE, SPARK_MEM and elastic references from zingg.sh

Made EMAIL optional in ClientOptions

Author: navinrathore

client/src/main/java/zingg/client/Client.java

@@ -160,7 +160,7 @@ else if (options.get(ClientOptions.CONF).value.endsWith("env")) {
 			LOG.warn("Zingg processing has completed");				
 		} 
 		catch(ZinggClientException e) {
-			if (options != null) {
+			if (options != null && options.get(ClientOptions.EMAIL) != null) {
 				Email.email(options.get(ClientOptions.EMAIL).value, new EmailBody("Error running Zingg job",
 					"Zingg Error ",
 					e.getMessage()));
@@ -186,7 +186,7 @@ else if (options.get(ClientOptions.CONF).value.endsWith("env")) {
 				}
 			}
 			catch(ZinggClientException e) {
-				if (options != null) {
+				if (options != null && options.get(ClientOptions.EMAIL) != null) {
 					Email.email(options.get(ClientOptions.EMAIL).value, new EmailBody("Error running Zingg job",
 						"Zingg Error ",
 						e.getMessage()));

client/src/main/java/zingg/client/ClientOptions.java

@@ -49,7 +49,7 @@ public class ClientOptions {
 	static {	//This is the canonical list of Zingg options.
 		optionMaster.put(CONF, new Option(CONF, true, "JSON configuration with data input output locations and field definitions", false, true));
 		optionMaster.put(PHASE, new Option(PHASE, true, Util.join(ZinggOptions.getAllZinggOptions(), "|"), false, true, ZinggOptions.getAllZinggOptions()));
-		optionMaster.put(LICENSE, new Option(LICENSE, true, "location of license file", false, true));
+		optionMaster.put(LICENSE, new Option(LICENSE, true, "location of license file", false, false));
 		optionMaster.put(JOBID, new Option(JOBID, true, "database job id for logging", false, false));
 		optionMaster.put(EMAIL, new Option(EMAIL, true, "notification email id. Can be an alias", false, false));
 		optionMaster.put(FORMAT, new Option(FORMAT, true, "format of the data", false, false));

scripts/zingg.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
 #ZINGG_HOME=./assembly/target
 ZINGG_JARS=$ZINGG_HOME/zingg-0.3.3-SNAPSHOT.jar
-[email protected]
-LICENSE="test"
-##for local
-export SPARK_MEM=10g
 
 if [[ -z "${ZINGG_EXTRA_JARS}" ]]; then
   OPTION_JARS=""
@@ -18,4 +14,4 @@ else
   OPTION_SPARK_CONF="${ZINGG_EXTRA_SPARK_CONF}"
 fi
 
-$SPARK_HOME/bin/spark-submit --master $SPARK_MASTER $OPTION_JARS $OPTION_SPARK_CONF --conf spark.serializer=org.apache.spark.serializer.KryoSerializer --conf spark.es.nodes="127.0.0.1" --conf spark.es.port="9200" --conf spark.es.resource="cluster/cluster1" --conf spark.default.parallelism="8" --conf spark.executor.extraJavaOptions="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+HeapDumpOnOutOfMemoryError -Xloggc:/tmp/memLog.txt -XX:+UseCompressedOops" --conf spark.executor.memory=10g --conf spark.debug.maxToStringFields=200 --driver-class-path $ZINGG_JARS --class zingg.client.Client $ZINGG_JARS $@ --email $EMAIL --license $LICENSE 
+$SPARK_HOME/bin/spark-submit --master $SPARK_MASTER $OPTION_JARS $OPTION_SPARK_CONF --conf spark.serializer=org.apache.spark.serializer.KryoSerializer --conf spark.default.parallelism="8" --conf spark.executor.extraJavaOptions="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+HeapDumpOnOutOfMemoryError -Xloggc:/tmp/memLog.txt -XX:+UseCompressedOops" --conf spark.executor.memory=10g --conf spark.debug.maxToStringFields=200 --driver-class-path $ZINGG_JARS --class zingg.client.Client $ZINGG_JARS $@