4 files changed, 8 insertions, 80 deletions
diff --git a/modules/context/api.go b/modules/context/api.go
index 04a472b382..89b0bb749a 100644
--- a/modules/context/api.go
+++ b/modules/context/api.go
@@ -72,7 +72,7 @@ func (ctx *APIContext) Error(status int, title string, obj interface{}) {
 	}
 
 	if status == 500 {
-		log.Error(4, "%s: %s", title, message)
+		log.Error("%s: %s", title, message)
 	}
 
 	ctx.JSON(status, APIError{
diff --git a/modules/context/context.go b/modules/context/context.go
index 5c7254de22..770d42e2c7 100644
--- a/modules/context/context.go
+++ b/modules/context/context.go
@@ -116,7 +116,7 @@ func (ctx *Context) RenderWithErr(msg string, tpl base.TplName, form interface{}
 // NotFound displays a 404 (Not Found) page and prints the given error, if any.
 func (ctx *Context) NotFound(title string, err error) {
 	if err != nil {
-		log.Error(4, "%s: %v", title, err)
+		log.Error("%s: %v", title, err)
 		if macaron.Env != macaron.PROD {
 			ctx.Data["ErrorMsg"] = err
 		}
@@ -131,7 +131,7 @@ func (ctx *Context) NotFound(title string, err error) {
 // error, if any.
 func (ctx *Context) ServerError(title string, err error) {
 	if err != nil {
-		log.Error(4, "%s: %v", title, err)
+		log.Error("%s: %v", title, err)
 		if macaron.Env != macaron.PROD {
 			ctx.Data["ErrorMsg"] = err
 		}
@@ -156,7 +156,7 @@ func (ctx *Context) NotFoundOrServerError(title string, errck func(error) bool,
 // HandleText handles HTTP status code
 func (ctx *Context) HandleText(status int, title string) {
 	if (status/100 == 4) || (status/100 == 5) {
-		log.Error(4, "%s", title)
+		log.Error("%s", title)
 	}
 	ctx.PlainText(status, []byte(title))
 }
diff --git a/modules/context/panic.go b/modules/context/panic.go
index 810c31a065..8ed91dea65 100644
--- a/modules/context/panic.go
+++ b/modules/context/panic.go
@@ -17,11 +17,9 @@
 package context
 
 import (
-	"bytes"
 	"fmt"
-	"io/ioutil"
-	"runtime"
 
+	"code.gitea.io/gitea/modules/log"
 	macaron "gopkg.in/macaron.v1"
 )
 
@@ -32,7 +30,7 @@ func Recovery() macaron.Handler {
 	return func(ctx *Context) {
 		defer func() {
 			if err := recover(); err != nil {
-				combinedErr := fmt.Errorf("%s\n%s", err, string(stack(3)))
+				combinedErr := fmt.Errorf("%s\n%s", err, string(log.Stack(2)))
 				ctx.ServerError("PANIC:", combinedErr)
 			}
 		}()
@@ -40,73 +38,3 @@ func Recovery() macaron.Handler {
 		ctx.Next()
 	}
 }
-
-var (
-	unknown = []byte("???")
-)
-
-// Although we could just use debug.Stack(), this routine will return the source code
-// skip the provided number of frames - i.e. allowing us to ignore this function call
-// and the preceding function call.
-// If the problem is a lack of memory of course all this is not going to work...
-func stack(skip int) []byte {
-	buf := new(bytes.Buffer)
-
-	// Store the last file we opened as its probable that the preceding stack frame
-	// will be in the same file
-	var lines [][]byte
-	var lastFilename string
-	for i := skip; ; i++ { // Skip over frames
-		programCounter, filename, lineNumber, ok := runtime.Caller(i)
-		// If we can't retrieve the information break - basically we're into go internals at this point.
-		if !ok {
-			break
-		}
-
-		// Print equivalent of debug.Stack()
-		fmt.Fprintf(buf, "%s:%d (0x%x)\n", filename, lineNumber, programCounter)
-		// Now try to print the offending line
-		if filename != lastFilename {
-			data, err := ioutil.ReadFile(filename)
-			if err != nil {
-				// can't read this sourcefile
-				// likely we don't have the sourcecode available
-				continue
-			}
-			lines = bytes.Split(data, []byte{'\n'})
-			lastFilename = filename
-		}
-		fmt.Fprintf(buf, "\t%s: %s\n", functionName(programCounter), source(lines, lineNumber))
-	}
-	return buf.Bytes()
-}
-
-// functionName converts the provided programCounter into a function name
-func functionName(programCounter uintptr) []byte {
-	function := runtime.FuncForPC(programCounter)
-	if function == nil {
-		return unknown
-	}
-	name := []byte(function.Name())
-
-	// Because we provide the filename we can drop the preceding package name.
-	if lastslash := bytes.LastIndex(name, []byte("/")); lastslash >= 0 {
-		name = name[lastslash+1:]
-	}
-	// And the current package name.
-	if period := bytes.Index(name, []byte(".")); period >= 0 {
-		name = name[period+1:]
-	}
-	// And we should just replace the interpunct with a dot
-	name = bytes.Replace(name, []byte("·"), []byte("."), -1)
-	return name
-}
-
-// source returns a space-trimmed slice of the n'th line.
-func source(lines [][]byte, n int) []byte {
-	n-- // in stack trace, lines are 1-indexed but our array is 0-indexed
-	if n < 0 || n >= len(lines) {
-		return unknown
-	}
-	return bytes.TrimSpace(lines[n])
-}
diff --git a/modules/context/repo.go b/modules/context/repo.go
index 20a3d19428..0cbd89a75f 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -124,7 +124,7 @@ func (r *Repository) BranchNameSubURL() string {
 	case r.IsViewCommit:
 		return "commit/" + r.BranchName
 	}
-	log.Error(4, "Unknown view type for repo: %v", r)
+	log.Error("Unknown view type for repo: %v", r)
 	return ""
 }
 
@@ -536,7 +536,7 @@ func getRefName(ctx *Context, pathType RepoRefType) string {
 		}
 		return path
 	default:
-		log.Error(4, "Unrecognized path type: %v", path)
+		log.Error("Unrecognized path type: %v", path)
 	}
 	return ""
 }