Browse Source

bump(github.com/ccding/go-logging): 4f3650d51969cc425c1940efa31fcb7c0bba86b3

Brandon Philips 12 years ago
parent
commit
7ec0ee2a19

+ 0 - 9
third_party/github.com/ccding/go-logging/README.md

@@ -5,14 +5,6 @@ go-logging is a high-performance logging library for golang.
   low delay of about 800 nano-seconds.
 
 ## Getting Started
-The stable version is under the `stable` branch, which does never revert and
-is fully tested. The tags in `stable` branch indicate the version numbers.
-
-However, `master` branch is unstable version, and `dev` branch is development
-branch. `master` branch merges `dev` branch periodically.
-
-Btw, all the pull request should be sent to the `dev` branch.
-
 ### Installation
 The step below will download the library source code to
 `${GOPATH}/src/github.com/ccding/go-logging`.
@@ -46,7 +38,6 @@ import (
 
 func main() {
 	logger, _ := logging.SimpleLogger("main")
-	logger.SetLevel(logging.DEBUG)
 	logger.Error("this is a test from error")
 	logger.Destroy()
 }

+ 1 - 1
third_party/github.com/ccding/go-logging/example.go

@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 // author: Cong Ding <dinggnu@gmail.com>
-//
+
 package main
 
 import (

+ 1 - 1
third_party/github.com/ccding/go-logging/logging/commands.go

@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 // author: Cong Ding <dinggnu@gmail.com>
-//
+
 package logging
 
 // Logln receives log request from the client. The request includes a set of

+ 1 - 1
third_party/github.com/ccding/go-logging/logging/fields.go

@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 // author: Cong Ding <dinggnu@gmail.com>
-//
+
 package logging
 
 import (

+ 1 - 1
third_party/github.com/ccding/go-logging/logging/fields_test.go

@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 // author: Cong Ding <dinggnu@gmail.com>
-//
+
 package logging
 
 import (

+ 1 - 1
third_party/github.com/ccding/go-logging/logging/formater.go

@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 // author: Cong Ding <dinggnu@gmail.com>
-//
+
 package logging
 
 import (

+ 1 - 1
third_party/github.com/ccding/go-logging/logging/get_go_id.c

@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 // author: Cong Ding <dinggnu@gmail.com>
-//
+
 // This file defines GetGoId function, which is used to get the id of the
 // current goroutine. More details about this function are availeble in the
 // runtime.c file of golang source code.

+ 1 - 1
third_party/github.com/ccding/go-logging/logging/level.go

@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 // author: Cong Ding <dinggnu@gmail.com>
-//
+
 package logging
 
 // Level is the type of level.

+ 21 - 22
third_party/github.com/ccding/go-logging/logging/logging.go

@@ -99,13 +99,15 @@ func RichLogger(name string) (*Logger, error) {
 func FileLogger(name string, level Level, format string, timeFormat string, file string, sync bool) (*Logger, error) {
 	out, err := os.Create(file)
 	if err != nil {
-		return new(Logger), err
+		return nil, err
 	}
 	logger, err := createLogger(name, level, format, timeFormat, out, sync)
 	if err == nil {
 		logger.fd = out
+		return logger, nil
+	} else {
+		return nil, err
 	}
-	return logger, err
 }
 
 // WriterLogger creates a new logger with a writer
@@ -115,38 +117,35 @@ func WriterLogger(name string, level Level, format string, timeFormat string, ou
 
 // WriterLogger creates a new logger from a configuration file
 func ConfigLogger(filename string) (*Logger, error) {
-	conf, err := config.Read(filename)
+	conf := config.NewConfig(filename)
+	err := conf.Read()
 	if err != nil {
-		return new(Logger), err
-	}
-	ok := true
-	name, ok := conf["name"]
-	if !ok {
-		name = ""
+		return nil, err
 	}
-	slevel, ok := conf["level"]
-	if !ok {
+	name := conf.Get("", "name")
+	slevel := conf.Get("", "level")
+	if slevel == "" {
 		slevel = "0"
 	}
 	l, err := strconv.Atoi(slevel)
 	if err != nil {
-		return new(Logger), err
+		return nil, err
 	}
 	level := Level(l)
-	format, ok := conf["format"]
-	if !ok {
+	format := conf.Get("", "format")
+	if format == "" {
 		format = BasicFormat
 	}
-	timeFormat, ok := conf["timeFormat"]
-	if !ok {
+	timeFormat := conf.Get("", "timeFormat")
+	if timeFormat == "" {
 		timeFormat = DefaultTimeFormat
 	}
-	ssync, ok := conf["sync"]
-	if !ok {
+	ssync := conf.Get("", "sync")
+	if ssync == "" {
 		ssync = "0"
 	}
-	file, ok := conf["file"]
-	if !ok {
+	file := conf.Get("", "file")
+	if file == "" {
 		file = DefaultFileName
 	}
 	sync := true
@@ -155,7 +154,7 @@ func ConfigLogger(filename string) (*Logger, error) {
 	} else if ssync == "1" {
 		sync = true
 	} else {
-		return new(Logger), err
+		return nil, err
 	}
 	return FileLogger(name, level, format, timeFormat, file, sync)
 }
@@ -166,7 +165,7 @@ func createLogger(name string, level Level, format string, timeFormat string, ou
 
 	err := logger.parseFormat(format)
 	if err != nil {
-		return logger, err
+		return nil, err
 	}
 
 	// asign values to logger

+ 1 - 1
third_party/github.com/ccding/go-logging/logging/logging_test.go

@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 // author: Cong Ding <dinggnu@gmail.com>
-//
+
 package logging
 
 import (

+ 1 - 1
third_party/github.com/ccding/go-logging/logging/request.go

@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 // author: Cong Ding <dinggnu@gmail.com>
-//
+
 package logging
 
 // request struct stores the logger request

+ 1 - 1
third_party/github.com/ccding/go-logging/logging/writer.go

@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 // author: Cong Ding <dinggnu@gmail.com>
-//
+
 package logging
 
 import (