Permalink
Browse files

Merge pull request #14 from evnm/template-trailing-whitespace

Rm trailing whitespace in template files
  • Loading branch information...
Robey Pointer
Robey Pointer committed Jul 19, 2011
2 parents 13cec2f + 8ccbbe6 commit 02ce6f4fca2efc9dfbc538b24d4e0772a49e9977
@@ -5,19 +5,19 @@ import com.twitter.birdname.config._
// development mode.
new BirdNameServiceConfig {
-
+
// Add your own config here
-
+
// Where your service will be exposed.
thriftPort = 9999
// Ostrich http admin port. Curl this for stats, etc
admin.httpPort = 9900
// End user configuration
-
- // Expert-only: Ostrich stats and logger configuration.
-
+
+ // Expert-only: Ostrich stats and logger configuration.
+
admin.statsNodes = new StatsConfig {
reporters = new JsonStatsLoggerConfig {
loggerName = "stats"
@@ -5,17 +5,17 @@ import com.twitter.birdname.config._
// production mode.
new BirdNameServiceConfig {
-
+
// Add your own config here
-
+
// Where your service will be exposed.
thriftPort = 9999
// Ostrich http admin port. Curl this for stats, etc
admin.httpPort = 9900
// End user configuration
-
+
// Expert-only: Ostrich stats and logger configuration.
admin.statsNodes = new StatsConfig {
reporters = new JsonStatsLoggerConfig {
@@ -5,17 +5,17 @@ import com.twitter.birdname.config._
// staging mode.
new BirdNameServiceConfig {
-
+
// Add your own config here
-
+
// Where your service will be exposed.
thriftPort = 9999
// Ostrich http admin port. Curl this for stats, etc
admin.httpPort = 9900
// End user configuration
-
+
// Expert-only: Ostrich stats and logger configuration.
admin.statsNodes = new StatsConfig {
reporters = new JsonStatsLoggerConfig {
@@ -5,17 +5,17 @@ import com.twitter.birdname.config._
// test mode.
new BirdNameServiceConfig {
-
+
// Add your own config here
-
+
// Where your service will be exposed.
thriftPort = 9999
// Ostrich http admin port. Curl this for stats, etc
admin.httpPort = 9900
// End user configuration
-
+
// Expert-only: Ostrich stats and logger configuration.
admin.statsNodes = new StatsConfig {
reporters = new JsonStatsLoggerConfig {
@@ -9,10 +9,10 @@ import com.twitter.sbt._
* val example = "com.example" % "exampleland" % "1.0.3"
* mean to add a dependency on exampleland version 1.0.3 from provider "com.example".
*/
-class BirdNameProject(info: ProjectInfo) extends StandardServiceProject(info)
- with CompileThriftScala
- with NoisyDependencies
- with DefaultRepos
+class BirdNameProject(info: ProjectInfo) extends StandardServiceProject(info)
+ with CompileThriftScala
+ with NoisyDependencies
+ with DefaultRepos
with SubversionPublisher
with PublishSourcesAndJavadocs
with PublishSite
@@ -29,7 +29,7 @@ class BirdNameProject(info: ProjectInfo) extends StandardServiceProject(info)
override def originalThriftNamespaces = Map("BirdName" -> "com.twitter.birdname.thrift")
override val scalaThriftTargetNamespace = "com.twitter.birdname"
-
+
val slf4jVersion = "1.5.11"
val slf4jApi = "org.slf4j" % "slf4j-api" % slf4jVersion withSources() intransitive()
val slf4jBindings = "org.slf4j" % "slf4j-jdk14" % slf4jVersion withSources() intransitive()
@@ -8,23 +8,23 @@ import config._
class BirdNameServiceImpl(config: BirdNameServiceConfig) extends BirdNameServiceServer {
val serverName = "BirdName"
val thriftPort = config.thriftPort
-
+
/**
- * These services are based on finagle, which implements a nonblocking server. If you
+ * These services are based on finagle, which implements a nonblocking server. If you
* are making blocking rpc calls, it's really important that you run these actions in
* a thread pool, so that you don't block the main event loop. This thread pool is only
* needed for these blocking actions. The code looks like:
*
* // Depends on com.twitter.util >= 1.6.10
* val futurePool = new FuturePool(Executors.newFixedThreadPool(config.threadPoolSize))
- *
+ *
* def hello() = futurePool {
* someService.blockingRpcCall
* }
- *
- */
+ *
+ */
- val database = new mutable.HashMap[String, String]()
+ val database = new mutable.HashMap[String, String]()
def get(key: String) = {
database.get(key) match {
@@ -65,7 +65,7 @@ case "$1" in
echo "already running."
exit 0
fi
-
+
ulimit -c unlimited || echo -n " (no coredump)"
$DAEMON $daemon_args $daemon_start_args -- sh -c "echo "'$$'" > $pidfile; exec ${JAVA_HOME}/bin/java ${JAVA_OPTS} -jar ${APP_HOME}/${JAR_NAME}"
tries=0
@@ -113,7 +113,7 @@ case "$1" in
done
echo "done."
;;
-
+
status)
if running; then
echo "$APP_NAME is running."
@@ -9,7 +9,7 @@ abstract class AbstractSpec extends Specification {
val env = RuntimeEnvironment(this, Array("-f", "config/test.scala"))
lazy val birdName = {
val out = env.loadRuntimeConfig[BirdNameService]
-
+
// You don't really want the thrift server active, particularly if you
// are running repetitively via ~test
ServiceTracker.shutdown // all services

0 comments on commit 02ce6f4

Please sign in to comment.