Merge utils to modules

5 files changed, 102 insertions, 2 deletions

diff --git a/modules/auth/form.go b/modules/auth/form.go
index 98c558399f..a90f3d8542 100644
--- a/modules/auth/form.go
+++ b/modules/auth/form.go
@@ -14,7 +14,7 @@ import (
 	"github.com/gogits/binding"
 
 	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/utils/log"
+	"github.com/gogits/gogs/modules/log"
 )
 
 type Form interface {
diff --git a/modules/auth/user.go b/modules/auth/user.go
index e25593b737..215cffedb0 100644
--- a/modules/auth/user.go
+++ b/modules/auth/user.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/gogits/gogs/models"
 	"github.com/gogits/gogs/modules/base"
-	"github.com/gogits/gogs/utils/log"
+	"github.com/gogits/gogs/modules/log"
 )
 
 func SignedInId(session sessions.Session) int64 {
diff --git a/modules/base/conf.go b/modules/base/conf.go
new file mode 100644
index 0000000000..19e9d689c2
--- /dev/null
+++ b/modules/base/conf.go
@@ -0,0 +1,46 @@
+// 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 base
+
+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/modules/base/tool.go b/modules/base/tool.go
new file mode 100644
index 0000000000..eef473f965
--- /dev/null
+++ b/modules/base/tool.go
@@ -0,0 +1,17 @@
+// 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 base
+
+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))
+}
diff --git a/modules/log/log.go b/modules/log/log.go
new file mode 100644
index 0000000000..0634bde655
--- /dev/null
+++ b/modules/log/log.go
@@ -0,0 +1,37 @@
+// 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...)
+}