diff --git a/build.sbt b/build.sbt index 6ca27e42..b40e6ae5 100644 --- a/build.sbt +++ b/build.sbt @@ -70,7 +70,7 @@ lazy val wvlet = publishLocal := {} ).aggregate(wvletCore, wvletTest, wvletServer, wvletUi) -val wvletLog = "org.wvlet" %% "wvlet-log" % "1.1" +val wvletLog = "org.wvlet" %% "wvlet-log" % "1.2.1" lazy val wvletCore = Project(id = "wvlet-core", base = file("wvlet-core")).settings( @@ -116,7 +116,7 @@ lazy val wvletServer = "com.twitter" %% "finatra-http" % "2.9.0", // sl4j -> wvlet-log bridge "org.slf4j" % "slf4j-jdk14" % "1.7.21", - "org.wvlet" %% "wvlet-log" % "1.2" + wvletLog ) ) @@ -134,7 +134,7 @@ lazy val wvletUi = "com.lihaoyi" %%% "scalatags" % "0.6.3", "com.typesafe.play" %%% "play-json" % "2.6.0-M6", "in.nvilla" %%% "monadic-html" % "0.3.0", - "org.wvlet" %%% "wvlet-log" % "1.2.1-SNAPSHOT" changing() + "org.wvlet" %%% "wvlet-log" % "1.2.1" ), jsDependencies ++= Seq( "org.webjars" % "jquery" % "2.1.4" / "2.1.4/jquery.js", diff --git a/wvlet-ui/src/main/scala/wvlet/ui/WvletUI.scala b/wvlet-ui/src/main/scala/wvlet/ui/WvletUI.scala index 57f7cddb..adfa4c47 100644 --- a/wvlet-ui/src/main/scala/wvlet/ui/WvletUI.scala +++ b/wvlet-ui/src/main/scala/wvlet/ui/WvletUI.scala @@ -3,8 +3,6 @@ package wvlet.ui import org.scalajs.dom import org.scalajs.dom.document import play.api.libs.json._ -import wvlet.log.LogFormatter.SourceCodeLogFormatter -import wvlet.log.LogTimestampFormatter.formatTimestamp import wvlet.ui.component.{LayoutFrame, Navbar} import wvlet.log._ import wvlet.ui.view.html.navbar @@ -12,21 +10,6 @@ import wvlet.ui.view.html.navbar import scala.scalajs.js import scalatags.JsDom.all._ -object UILogFormatter extends LogFormatter { - override def formatLog(r: LogRecord): String = { - val loc = - r.source - .map(source => s" - (${source.fileLoc})") - .getOrElse("") - - val log = f"${formatTimestamp(r.getMillis)} ${r.level.name}%5s [${r.leafLoggerName}] ${r.getMessage} ${loc}" - r.cause match { - case Some(ex) => s"${log}\n${LogFormatter.formatStacktrace(ex)}" - case None => log - } - } -} - object WvletUI extends js.JSApp with LogSupport { case class FormData( @@ -40,9 +23,17 @@ object WvletUI extends js.JSApp with LogSupport { implicit val projectReader = Json.reads[Project] Logger.setDefaultHandler(new JSConsoleLogHandler) + Logger.setDefaultLogLevel(LogLevel.ALL) def main() = { - Logger.setDefaultLogLevel(LogLevel.DEBUG) + + info("info") + debug("debug") + trace("trace") + warn("warn") + error("error") + + info("Start WvletUI") val m = document.getElementById("main") val layout = LayoutFrame.render(

hello wvlet

) diff --git a/wvlet-ui/src/main/scala/wvlet/ui/component/Navbar.scala b/wvlet-ui/src/main/scala/wvlet/ui/component/Navbar.scala index a3621747..b3885b60 100644 --- a/wvlet-ui/src/main/scala/wvlet/ui/component/Navbar.scala +++ b/wvlet-ui/src/main/scala/wvlet/ui/component/Navbar.scala @@ -49,24 +49,6 @@ object Navbar extends RxElement with LogSupport { state.update(x => name) } - def body2 = state.map {page => - - } - def body = state.map {page =>
wvlet