diff options
| author | Luciano Resende <lresende@apache.org> | 2017-01-17 22:52:11 -0800 |
|---|---|---|
| committer | Luciano Resende <lresende@apache.org> | 2017-01-18 09:41:52 -0800 |
| commit | a6d3e04fd20fde9ecf3de22564c1d9196cae7e40 (patch) | |
| tree | 813d260a2c069a1396b7950b426f02bc8f8b4be6 | |
| parent | 4bb04ad258ab487e4321c81bf1da864186eb84c3 (diff) | |
| download | toree-gateway-a6d3e04fd20fde9ecf3de22564c1d9196cae7e40.tar.gz toree-gateway-a6d3e04fd20fde9ecf3de22564c1d9196cae7e40.tar.bz2 toree-gateway-a6d3e04fd20fde9ecf3de22564c1d9196cae7e40.zip | |
Fix kernel artifact naming and references
| -rw-r--r-- | python/toree-gateway-kernel.py (renamed from python/toree_gateway_kernel.py) | 4 | ||||
| -rw-r--r-- | src/main/assembly/distribution.xml | 2 | ||||
| -rw-r--r-- | src/main/resources/log4j.properties | 2 | ||||
| -rw-r--r-- | src/main/scala/com/ibm/ToreeGateway.scala | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/python/toree_gateway_kernel.py b/python/toree-gateway-kernel.py index 46b264a..d364407 100644 --- a/python/toree_gateway_kernel.py +++ b/python/toree-gateway-kernel.py @@ -64,8 +64,8 @@ class ToreeKernel(MetaKernel): args = [ "java", "-classpath", - "/opt/toree_proxy/lib/toree-gateway-1.0-jar-with-dependencies.jar", - "com.ibm.ToreeGateway" + "/opt/toree-gateway/lib/toree-gateway-1.0-jar-with-dependencies.jar", + "com.ibm.ToreeGatewayClient" ] self.gateway_proc = Popen(args, stderr=PIPE, stdout=PIPE) diff --git a/src/main/assembly/distribution.xml b/src/main/assembly/distribution.xml index 3e6146a..e2ecf36 100644 --- a/src/main/assembly/distribution.xml +++ b/src/main/assembly/distribution.xml @@ -46,7 +46,7 @@ <outputDirectory>python</outputDirectory> <includes> <include>setup.py</include> - <include>toree_gateway_kernel.py</include> + <include>toree-gateway-kernel.py</include> </includes> </fileSet> diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties index 36cf436..69bdd14 100644 --- a/src/main/resources/log4j.properties +++ b/src/main/resources/log4j.properties @@ -19,7 +19,7 @@ log4j.rootLogger=ALL, file, stdout # Direct log messages to a log file log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File=/opt/toree_proxy/logs/toree-proxy-client.log +log4j.appender.file.File=/opt/toree-gateway/logs/toree-gateway.log log4j.appender.file.MaxFileSize=10MB log4j.appender.file.MaxBackupIndex=10 log4j.appender.file.layout=org.apache.log4j.PatternLayout diff --git a/src/main/scala/com/ibm/ToreeGateway.scala b/src/main/scala/com/ibm/ToreeGateway.scala index a27e0bb..a8f4bdc 100644 --- a/src/main/scala/com/ibm/ToreeGateway.scala +++ b/src/main/scala/com/ibm/ToreeGateway.scala @@ -78,8 +78,8 @@ class ToreeGateway(client: SparkKernelClient) { } catch { case t : Throwable => { - log.info("Error proxying request: " + t.getMessage, t) - promise.success("Error proxying request: " + t.getMessage) + log.info("Error submitting request: " + t.getMessage, t) + promise.success("Error submitting request: " + t.getMessage) } } @@ -92,7 +92,7 @@ object ToreeGatewayClient extends App { final val log = LoggerFactory.getLogger(this.getClass.getName.stripSuffix("$")) def getConfigurationFilePath: String = { - var filePath = "/opt/toree_proxy/conf/profile.json" + var filePath = "/opt/toree-gateway/conf/profile.json" if (args.length == 0) { for (arg <- args) { @@ -124,7 +124,7 @@ object ToreeGatewayClient extends App { with StandardSystemInitialization with StandardHandlerInitialization).createClient() - val toreeGateway = new ToreeGateway(client) + val toreeGateway = new ToreeClientExecutor(client) val gatewayServer: GatewayServer = new GatewayServer(toreeGateway) gatewayServer.start() |