Move debug router location
This commit is contained in:
		
							parent
							
								
									9b014d05e4
								
							
						
					
					
						commit
						7ffdabb28f
					
				
					 5 changed files with 10 additions and 19 deletions
				
			
		
							
								
								
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -12,7 +12,6 @@ public/img/avatar/
 | 
			
		|||
*.o
 | 
			
		||||
*.a
 | 
			
		||||
*.so
 | 
			
		||||
dev
 | 
			
		||||
 | 
			
		||||
# Folders
 | 
			
		||||
_obj
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -26,7 +26,6 @@ import (
 | 
			
		|||
	"github.com/gogits/gogs/routers"
 | 
			
		||||
	"github.com/gogits/gogs/routers/admin"
 | 
			
		||||
	"github.com/gogits/gogs/routers/api/v1"
 | 
			
		||||
	"github.com/gogits/gogs/routers/debug"
 | 
			
		||||
	"github.com/gogits/gogs/routers/dev"
 | 
			
		||||
	"github.com/gogits/gogs/routers/org"
 | 
			
		||||
	"github.com/gogits/gogs/routers/repo"
 | 
			
		||||
| 
						 | 
				
			
			@ -185,6 +184,7 @@ func runWeb(*cli.Context) {
 | 
			
		|||
 | 
			
		||||
	if martini.Env == martini.Dev {
 | 
			
		||||
		m.Get("/template/**", dev.TemplatePreview)
 | 
			
		||||
		dev.RegisterDebugRoutes(m)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	reqTrueOwner := middleware.RequireTrueOwner()
 | 
			
		||||
| 
						 | 
				
			
			@ -206,8 +206,6 @@ func runWeb(*cli.Context) {
 | 
			
		|||
		r.Post("/:org/settings/delete", org.DeletePost)
 | 
			
		||||
	}, reqSignIn)
 | 
			
		||||
 | 
			
		||||
	debug.RegisterRoutes(m)
 | 
			
		||||
 | 
			
		||||
	m.Group("/:username/:reponame", func(r martini.Router) {
 | 
			
		||||
		r.Get("/settings", repo.Setting)
 | 
			
		||||
		r.Post("/settings", bindIgnErr(auth.RepoSettingForm{}), repo.SettingPost)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -276,6 +276,10 @@ func GetIssueUserPairs(rid, uid int64, isClosed bool) ([]*IssueUser, error) {
 | 
			
		|||
 | 
			
		||||
// GetIssueUserPairsByRepoIds returns issue-user pairs by given repository IDs.
 | 
			
		||||
func GetIssueUserPairsByRepoIds(rids []int64, isClosed bool, page int) ([]*IssueUser, error) {
 | 
			
		||||
	if len(rids) == 0 {
 | 
			
		||||
		return []*IssueUser{}, nil
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	buf := bytes.NewBufferString("")
 | 
			
		||||
	for _, rid := range rids {
 | 
			
		||||
		buf.WriteString("repo_id=")
 | 
			
		||||
| 
						 | 
				
			
			@ -283,7 +287,6 @@ func GetIssueUserPairsByRepoIds(rids []int64, isClosed bool, page int) ([]*Issue
 | 
			
		|||
		buf.WriteString(" OR ")
 | 
			
		||||
	}
 | 
			
		||||
	cond := strings.TrimSuffix(buf.String(), " OR ")
 | 
			
		||||
 | 
			
		||||
	ius := make([]*IssueUser, 0, 10)
 | 
			
		||||
	sess := x.Limit(20, (page-1)*20).Where("is_closed=?", isClosed)
 | 
			
		||||
	if len(cond) > 0 {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,11 +0,0 @@
 | 
			
		|||
// +build !pprof
 | 
			
		||||
 | 
			
		||||
package debug
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"github.com/go-martini/martini"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func RegisterRoutes(r martini.Router) {
 | 
			
		||||
	// do nothing
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -1,6 +1,8 @@
 | 
			
		|||
// +build pprof
 | 
			
		||||
// 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 debug
 | 
			
		||||
package dev
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"net/http/pprof"
 | 
			
		||||
| 
						 | 
				
			
			@ -8,7 +10,7 @@ import (
 | 
			
		|||
	"github.com/go-martini/martini"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
func RegisterRoutes(r martini.Router) {
 | 
			
		||||
func RegisterDebugRoutes(r martini.Router) {
 | 
			
		||||
	r.Any("/debug/pprof/cmdline", pprof.Cmdline)
 | 
			
		||||
	r.Any("/debug/pprof/profile", pprof.Profile)
 | 
			
		||||
	r.Any("/debug/pprof/symbol", pprof.Symbol)
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue