erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Merge pull request #294 from ethauvin/master

Browse source 
String changed to CharSequence in logging functions
This commit is contained in:
Cedric Beust 2016-07-30 16:08:05 -07:00 • committed by GitHub
commit e19201de33
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/AsciiArt.kt
View file

@ -106,14 +106,14 @@ class AsciiArt {
const val CYAN = "\u001B[36m" const val CYAN = "\u001B[36m"
const val WHITE = "\u001B[37m" const val WHITE = "\u001B[37m"
private fun wrap(s: String, color: String) = color + s + RESET private fun wrap(s: CharSequence, color: String) = color + s + RESET
private fun blue(s: String) = wrap(s, BLUE) private fun blue(s: CharSequence) = wrap(s, BLUE)
private fun red(s: String) = wrap(s, RED) private fun red(s: CharSequence) = wrap(s, RED)
private fun yellow(s: String) = wrap(s, YELLOW) private fun yellow(s: CharSequence) = wrap(s, YELLOW)
fun taskColor(s: String) = s fun taskColor(s: CharSequence) = s
fun errorColor(s: String) = red(s) fun errorColor(s: CharSequence) = red(s)
fun warnColor(s: String) = red(s) fun warnColor(s: CharSequence) = red(s)
} }
} }

22
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KobaltLogger.kt
View file

@ -6,13 +6,13 @@ import com.beust.kobalt.api.Kobalt
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
fun Any.log(level: Int, text: String, newLine : Boolean = true) { fun Any.log(level: Int, text: CharSequence, newLine : Boolean = true) {
if (level <= KobaltLogger.LOG_LEVEL) { if (level <= KobaltLogger.LOG_LEVEL) {
KobaltLogger.logger.log(javaClass.simpleName, text, newLine) KobaltLogger.logger.log(javaClass.simpleName, text, newLine)
} }
} }
fun Any.logWrap(level: Int, text1: String, text2: String, function: () -> Unit) { fun Any.logWrap(level: Int, text1: CharSequence, text2: CharSequence, function: () -> Unit) {
if (level <= KobaltLogger.LOG_LEVEL) { if (level <= KobaltLogger.LOG_LEVEL) {
KobaltLogger.logger.log(javaClass.simpleName, text1, newLine = false) KobaltLogger.logger.log(javaClass.simpleName, text1, newLine = false)
} }
@ -22,17 +22,17 @@ fun Any.logWrap(level: Int, text1: String, text2: String, function: () -> Unit)
} }
} }
fun Any.debug(text: String) { fun Any.debug(text: CharSequence) {
KobaltLogger.logger.debug(javaClass.simpleName, text) KobaltLogger.logger.debug(javaClass.simpleName, text)
} }
fun Any.warn(text: String, exception: Exception? = null) { fun Any.warn(text: CharSequence, exception: Exception? = null) {
KobaltLogger.logger.warn(javaClass.simpleName, text, exception) KobaltLogger.logger.warn(javaClass.simpleName, text, exception)
} }
fun Any.kobaltError(text: String, e: Throwable? = null) = error(text, e) fun Any.kobaltError(text: CharSequence, e: Throwable? = null) = error(text, e)
fun Any.error(text: String, e: Throwable? = null) { fun Any.error(text: CharSequence, e: Throwable? = null) {
KobaltLogger.logger.error(javaClass.simpleName, text, e) KobaltLogger.logger.error(javaClass.simpleName, text, e)
} }
@ -50,7 +50,7 @@ object KobaltLogger {
class Logger(val dev: Boolean) { class Logger(val dev: Boolean) {
val FORMAT = SimpleDateFormat("HH:mm:ss.SSS") val FORMAT = SimpleDateFormat("HH:mm:ss.SSS")
private fun getPattern(shortTag: String, shortMessage: String, longMessage: String, tag: String) = private fun getPattern(shortTag: String, shortMessage: CharSequence, longMessage: CharSequence, tag: String) =
if (dev) { if (dev) {
val ts = FORMAT.format(Date()) val ts = FORMAT.format(Date())
"$shortTag/$ts [" + Thread.currentThread().name + "] $tag - $shortMessage" "$shortTag/$ts [" + Thread.currentThread().name + "] $tag - $shortMessage"
@ -58,10 +58,10 @@ class Logger(val dev: Boolean) {
longMessage longMessage
} }
final fun debug(tag: String, message: String) = final fun debug(tag: String, message: CharSequence) =
println(getPattern("D", message, message, tag)) println(getPattern("D", message, message, tag))
final fun error(tag: String, message: String, e: Throwable? = null) { final fun error(tag: String, message: CharSequence, e: Throwable? = null) {
val docUrl = if (e is KobaltException && e.docUrl != null) e.docUrl else null val docUrl = if (e is KobaltException && e.docUrl != null) e.docUrl else null
val text = if (! message.isBlank()) message val text = if (! message.isBlank()) message
else if (e != null && (! e.message.isNullOrBlank())) e.message else if (e != null && (! e.message.isNullOrBlank())) e.message
@ -75,7 +75,7 @@ class Logger(val dev: Boolean) {
} }
} }
final fun warn(tag: String, message: String, e: Throwable? = null) { final fun warn(tag: String, message: CharSequence, e: Throwable? = null) {
val fullMessage = "***** WARNING " + (e?.message ?: message) val fullMessage = "***** WARNING " + (e?.message ?: message)
println(AsciiArt.Companion.warnColor(getPattern("W", fullMessage, fullMessage, tag))) println(AsciiArt.Companion.warnColor(getPattern("W", fullMessage, fullMessage, tag)))
if (KobaltLogger.LOG_LEVEL > 1) { if (KobaltLogger.LOG_LEVEL > 1) {
@ -83,7 +83,7 @@ class Logger(val dev: Boolean) {
} }
} }
final fun log(tag: String, message: String, newLine: Boolean) = final fun log(tag: String, message: CharSequence, newLine: Boolean) =
with(getPattern("L", message, message, tag)) { with(getPattern("L", message, message, tag)) {
if (newLine) println(this) if (newLine) println(this)
else print("\r" + this) else print("\r" + this)