Skip to content

Commit

Permalink
Fixup Scribe script, add a localhost Finatra config
Browse files Browse the repository at this point in the history
- Fix issue in collector.sh (referencing the wrong JAR)
- Add config file for Finatra which uses the localhost zookeeper and
  doesn't override the queryhost

Author: @glynd
Fixes #106
URL: #106
  • Loading branch information
Franklin Hu committed Aug 13, 2012
1 parent 080ddfb commit 7836a00
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 1 deletion.
31 changes: 31 additions & 0 deletions zipkin-finatra/config/web-localhost.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
/*
* Copyright 2012 Twitter Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import com.twitter.zipkin.config.ZipkinWebConfig
import com.twitter.zipkin.config.zookeeper.ZooKeeperConfig
import java.net.InetSocketAddress

new ZipkinWebConfig {
// Change the hostname below to allow the Zipkin JS code to talk to the Zipkin API Scala code
// Suspect this should be marked as a bug really...
rootUrl = "http://localhost:" + serverPort + "/"

def zkConfig = new ZooKeeperConfig {
servers = List("localhost:2181")
}

}

2 changes: 1 addition & 1 deletion zipkin-scribe/src/scripts/collector.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
VERSION=@VERSION@
java -cp "$DIR/../libs/*" -jar $DIR/../zipkin-server_2.9.1-$VERSION.jar $*
java -cp "$DIR/../libs/*" -jar $DIR/../zipkin-scribe_2.9.1-$VERSION.jar $*

0 comments on commit 7836a00

Please sign in to comment.