diff options
author | Unknown <joe2010xtmf@163.com> | 2014-03-07 17:22:15 -0500 |
---|---|---|
committer | Unknown <joe2010xtmf@163.com> | 2014-03-07 17:22:15 -0500 |
commit | 5a05d6633d413b1c5182a0a542e173f99601a103 (patch) | |
tree | b6d343ca8c998909839d1364f466f7af223fdd1b /utils | |
parent | a2a59f8ad1192d3504abd50b2daf2ebfd97c86ca (diff) |
Merge utils to modules
Diffstat (limited to 'utils')
-rw-r--r-- | utils/conf.go | 46 | ||||
-rw-r--r-- | utils/log/log.go | 37 | ||||
-rw-r--r-- | utils/tool.go | 17 |
3 files changed, 0 insertions, 100 deletions
diff --git a/utils/conf.go b/utils/conf.go deleted file mode 100644 index 75bd2462..00000000 --- a/utils/conf.go +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2014 The Gogs Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package utils - -import ( - "fmt" - "os" - "os/exec" - "path" - "path/filepath" - - "github.com/Unknwon/goconfig" -) - -var Cfg *goconfig.ConfigFile - -func exeDir() (string, error) { - file, err := exec.LookPath(os.Args[0]) - if err != nil { - return "", err - } - p, err := filepath.Abs(file) - if err != nil { - return "", err - } - return path.Dir(p), nil -} - -func init() { - var err error - workDir, err := exeDir() - if err != nil { - fmt.Printf("Fail to get work directory: %s\n", err) - os.Exit(2) - } - - cfgPath := filepath.Join(workDir, "conf", "app.ini") - Cfg, err = goconfig.LoadConfigFile(cfgPath) - if err != nil { - fmt.Printf("Cannot load config file '%s'\n", cfgPath) - os.Exit(2) - } - Cfg.BlockMode = false -} diff --git a/utils/log/log.go b/utils/log/log.go deleted file mode 100644 index 0634bde6..00000000 --- a/utils/log/log.go +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2014 The Gogs Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -// Package log is a wrapper of logs for short calling name. -package log - -import ( - "github.com/gogits/logs" -) - -var logger *logs.BeeLogger - -func init() { - logger = logs.NewLogger(10000) - logger.SetLogger("console", "") -} - -func Trace(format string, v ...interface{}) { - logger.Trace(format, v...) -} - -func Info(format string, v ...interface{}) { - logger.Info(format, v...) -} - -func Error(format string, v ...interface{}) { - logger.Error(format, v...) -} - -func Warn(format string, v ...interface{}) { - logger.Warn(format, v...) -} - -func Critical(format string, v ...interface{}) { - logger.Critical(format, v...) -} diff --git a/utils/tool.go b/utils/tool.go deleted file mode 100644 index 1d2db4bc..00000000 --- a/utils/tool.go +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2014 The Gogs Authors. All rights reserved. -// Use of this source code is governed by a MIT-style -// license that can be found in the LICENSE file. - -package utils - -import ( - "crypto/md5" - "encoding/hex" -) - -// Encode string to md5 hex value -func EncodeMd5(str string) string { - m := md5.New() - m.Write([]byte(str)) - return hex.EncodeToString(m.Sum(nil)) -} |