You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by da...@apache.org on 2016/01/04 07:41:12 UTC
[39/46] incubator-s2graph git commit: Make logger works
Make logger works
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/5a77433d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/5a77433d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/5a77433d
Branch: refs/heads/feature/test_daewon
Commit: 5a77433dd53b84913d74e794564775d0ee90a5a1
Parents: 5c0af72
Author: daewon <bl...@gmail.com>
Authored: Wed Dec 30 11:53:47 2015 +0900
Committer: daewon <bl...@gmail.com>
Committed: Wed Dec 30 11:53:47 2015 +0900
----------------------------------------------------------------------
s2core/src/main/resources/logback.xml | 15 ++++++++-----
s2core/src/main/resources/reference.conf | 22 ++++++++------------
.../core/storage/hbase/AsynchbaseStorage.scala | 10 ++++-----
.../hbase/AsynchbaseQueryBuilderTest.scala | 3 ++-
4 files changed, 26 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/5a77433d/s2core/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/s2core/src/main/resources/logback.xml b/s2core/src/main/resources/logback.xml
index 428a70f..9174452 100644
--- a/s2core/src/main/resources/logback.xml
+++ b/s2core/src/main/resources/logback.xml
@@ -1,19 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
- <jmxConfigurator/>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>
- %d{ISO8601} %-5level [%thread] %logger{0}: %msg%n
+ %d{ISO8601} [%-5level] [%cyan(%logger{0})] [%thread] - %msg%n
</pattern>
</encoder>
</appender>
- <root name="error" level="error">
+ <root level="INFO">
<appender-ref ref="STDOUT"/>
</root>
- <root name="application" level="info">
+ <logger name="application" level="DEBUG">
<appender-ref ref="STDOUT"/>
- </root>
+ </logger>
+
+ <logger name="error" level="DEBUG">
+ <appender-ref ref="STDOUT"/>
+ </logger>
</configuration>
+
+
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/5a77433d/s2core/src/main/resources/reference.conf
----------------------------------------------------------------------
diff --git a/s2core/src/main/resources/reference.conf b/s2core/src/main/resources/reference.conf
index 5727b28..176159a 100644
--- a/s2core/src/main/resources/reference.conf
+++ b/s2core/src/main/resources/reference.conf
@@ -1,22 +1,18 @@
# APP PHASE
-phase=dev
+phase = dev
-host=localhost
+host = localhost
-logger.root=DEBUG
-
-logger.application=DEBUG
-
-hbase.zookeeper.quorum=${host}
+hbase.zookeeper.quorum = ${host}
# DB
-s2graph.models.table.name="models-dev"
-db.default.driver="com.mysql.jdbc.Driver"
-db.default.url="jdbc:mysql://"${host}":3306/graph_dev"
-db.default.user="graph"
-db.default.password="graph"
+s2graph.models.table.name = "models-dev"
+db.default.driver = "com.mysql.jdbc.Driver"
+db.default.url = "jdbc:mysql://"${host}":3306/graph_dev"
+db.default.user = "graph"
+db.default.password = "graph"
-cache.max.size=100000
+cache.max.size = 100000
akka {
loggers = ["akka.event.slf4j.Slf4jLogger"]
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/5a77433d/s2core/src/main/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseStorage.scala
----------------------------------------------------------------------
diff --git a/s2core/src/main/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseStorage.scala b/s2core/src/main/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseStorage.scala
index acb7573..bad8a13 100644
--- a/s2core/src/main/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseStorage.scala
+++ b/s2core/src/main/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseStorage.scala
@@ -57,7 +57,7 @@ class AsynchbaseStorage(val config: Config, vertexCache: Cache[Integer, Option[V
val queryBuilder = new AsynchbaseQueryBuilder(this)(ec)
val mutationBuilder = new AsynchbaseMutationBuilder(this)(ec)
-// val cacheOpt = Option(cache)
+ // val cacheOpt = Option(cache)
val cacheOpt = None
val vertexCacheOpt = Option(vertexCache)
@@ -312,7 +312,7 @@ class AsynchbaseStorage(val config: Config, vertexCache: Cache[Integer, Option[V
}
}
val newVersion = kvOpt.map(_.timestamp()).getOrElse(edge.ts) + 1
-// snapshotEdgeOpt.map(_.version).getOrElse(edge.ts) + 1
+ // snapshotEdgeOpt.map(_.version).getOrElse(edge.ts) + 1
val pendingEdge = edge.copy(version = newVersion, statusCode = 1, lockTs = lockTs)
val base = snapshotEdgeOpt match {
case None =>
@@ -471,9 +471,9 @@ class AsynchbaseStorage(val config: Config, vertexCache: Cache[Integer, Option[V
edgeUpdate: EdgeMutate): Future[Boolean] = {
val label = edge.label
def oldBytes = kvOpt.map(_.value()).getOrElse(Array.empty)
-// def oldBytes = snapshotEdgeOpt.map { e =>
-// snapshotEdgeSerializer(e.toSnapshotEdge).toKeyValues.head.value
-// }.getOrElse(Array.empty)
+ // def oldBytes = snapshotEdgeOpt.map { e =>
+ // snapshotEdgeSerializer(e.toSnapshotEdge).toKeyValues.head.value
+ // }.getOrElse(Array.empty)
def process(lockEdge: SnapshotEdge,
releaseLockEdge: SnapshotEdge,
_edgeMutate: EdgeMutate,
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/5a77433d/s2core/src/test/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseQueryBuilderTest.scala
----------------------------------------------------------------------
diff --git a/s2core/src/test/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseQueryBuilderTest.scala b/s2core/src/test/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseQueryBuilderTest.scala
index 9b876c0..4c94389 100644
--- a/s2core/src/test/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseQueryBuilderTest.scala
+++ b/s2core/src/test/scala/com/kakao/s2graph/core/storage/hbase/AsynchbaseQueryBuilderTest.scala
@@ -1,6 +1,7 @@
package com.kakao.s2graph.core.storage.hbase
import com.kakao.s2graph.core.Graph
+import com.kakao.s2graph.core.utils.logger
import com.typesafe.config.ConfigFactory
import org.apache.hadoop.hbase.util.Bytes
import org.hbase.async.GetRequest
@@ -46,6 +47,6 @@ class AsynchbaseQueryBuilderTest extends FunSuite with Matchers {
}
val duration = System.nanoTime() - startedAt
- println(s">> bytes: $duration")
+ logger.debug(s">> bytes: $duration")
}
}