mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-04 09:19:06 +01:00
#2852 code cleanup
This commit is contained in:
parent
1dd003bd4c
commit
a47aef5460
7 changed files with 31 additions and 27 deletions
|
@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
|
||||||
|
|
||||||
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
|
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
|
||||||
|
|
||||||
##### Current tip version: 0.9.73 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
|
##### Current tip version: 0.9.74 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
|
||||||
|
|
||||||
| Web | UI | Preview |
|
| Web | UI | Preview |
|
||||||
|:-------------:|:-------:|:-------:|
|
|:-------------:|:-------:|:-------:|
|
||||||
|
|
26
cmd/web.go
26
cmd/web.go
|
@ -577,16 +577,19 @@ func runWeb(ctx *cli.Context) error {
|
||||||
|
|
||||||
// Flag for port number in case first time run conflict.
|
// Flag for port number in case first time run conflict.
|
||||||
if ctx.IsSet("port") {
|
if ctx.IsSet("port") {
|
||||||
setting.AppUrl = strings.Replace(setting.AppUrl, setting.HttpPort, ctx.String("port"), 1)
|
setting.AppUrl = strings.Replace(setting.AppUrl, setting.HTTPPort, ctx.String("port"), 1)
|
||||||
setting.HttpPort = ctx.String("port")
|
setting.HTTPPort = ctx.String("port")
|
||||||
}
|
}
|
||||||
|
|
||||||
var err error
|
var listenAddr string
|
||||||
listenAddr := fmt.Sprintf("%s:%s", setting.HttpAddr, setting.HttpPort)
|
|
||||||
if setting.Protocol == setting.UNIX_SOCKET {
|
if setting.Protocol == setting.UNIX_SOCKET {
|
||||||
listenAddr = fmt.Sprintf("%s", setting.HttpAddr)
|
listenAddr = fmt.Sprintf("%s", setting.HTTPAddr)
|
||||||
|
} else {
|
||||||
|
listenAddr = fmt.Sprintf("%s:%s", setting.HTTPAddr, setting.HTTPPort)
|
||||||
}
|
}
|
||||||
log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, setting.AppSubUrl)
|
log.Info("Listen: %v://%s%s", setting.Protocol, listenAddr, setting.AppSubUrl)
|
||||||
|
|
||||||
|
var err error
|
||||||
switch setting.Protocol {
|
switch setting.Protocol {
|
||||||
case setting.HTTP:
|
case setting.HTTP:
|
||||||
err = http.ListenAndServe(listenAddr, m)
|
err = http.ListenAndServe(listenAddr, m)
|
||||||
|
@ -597,18 +600,19 @@ func runWeb(ctx *cli.Context) error {
|
||||||
err = fcgi.Serve(nil, m)
|
err = fcgi.Serve(nil, m)
|
||||||
case setting.UNIX_SOCKET:
|
case setting.UNIX_SOCKET:
|
||||||
os.Remove(listenAddr)
|
os.Remove(listenAddr)
|
||||||
listener, err := net.ListenUnix("unix", &net.UnixAddr{listenAddr, "unix"})
|
|
||||||
|
var listener *net.UnixListener
|
||||||
|
listener, err = net.ListenUnix("unix", &net.UnixAddr{listenAddr, "unix"})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
break
|
break // Handle error after switch
|
||||||
}
|
}
|
||||||
// FIXME add proper implementation of signal capture on all protocols
|
|
||||||
|
// FIXME: add proper implementation of signal capture on all protocols
|
||||||
// execute this on SIGTERM or SIGINT: listener.Close()
|
// execute this on SIGTERM or SIGINT: listener.Close()
|
||||||
err = os.Chmod(listenAddr, os.FileMode(setting.UnixSocketPermission))
|
if err = os.Chmod(listenAddr, os.FileMode(setting.UnixSocketPermission)); err != nil {
|
||||||
if err != nil {
|
|
||||||
log.Fatal(4, "Failed to set permission of unix socket: %v", err)
|
log.Fatal(4, "Failed to set permission of unix socket: %v", err)
|
||||||
}
|
}
|
||||||
err = http.Serve(listener, m)
|
err = http.Serve(listener, m)
|
||||||
|
|
||||||
default:
|
default:
|
||||||
log.Fatal(4, "Invalid protocol: %s", setting.Protocol)
|
log.Fatal(4, "Invalid protocol: %s", setting.Protocol)
|
||||||
}
|
}
|
||||||
|
|
2
gogs.go
2
gogs.go
|
@ -17,7 +17,7 @@ import (
|
||||||
"github.com/gogits/gogs/modules/setting"
|
"github.com/gogits/gogs/modules/setting"
|
||||||
)
|
)
|
||||||
|
|
||||||
const APP_VER = "0.9.73.0811"
|
const APP_VER = "0.9.74.0811"
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -62,7 +62,7 @@ var (
|
||||||
// Server settings
|
// Server settings
|
||||||
Protocol Scheme
|
Protocol Scheme
|
||||||
Domain string
|
Domain string
|
||||||
HttpAddr, HttpPort string
|
HTTPAddr, HTTPPort string
|
||||||
LocalURL string
|
LocalURL string
|
||||||
OfflineMode bool
|
OfflineMode bool
|
||||||
DisableRouterLog bool
|
DisableRouterLog bool
|
||||||
|
@ -372,17 +372,17 @@ func NewContext() {
|
||||||
Protocol = FCGI
|
Protocol = FCGI
|
||||||
} else if sec.Key("PROTOCOL").String() == "unix" {
|
} else if sec.Key("PROTOCOL").String() == "unix" {
|
||||||
Protocol = UNIX_SOCKET
|
Protocol = UNIX_SOCKET
|
||||||
}
|
|
||||||
Domain = sec.Key("DOMAIN").MustString("localhost")
|
|
||||||
HttpAddr = sec.Key("HTTP_ADDR").MustString("0.0.0.0")
|
|
||||||
HttpPort = sec.Key("HTTP_PORT").MustString("3000")
|
|
||||||
LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(string(Protocol) + "://localhost:" + HttpPort + "/")
|
|
||||||
UnixSocketPermissionRaw := sec.Key("UNIX_SOCKET_PERMISSION").MustString("666")
|
UnixSocketPermissionRaw := sec.Key("UNIX_SOCKET_PERMISSION").MustString("666")
|
||||||
UnixSocketPermissionParsed, err := strconv.ParseUint(UnixSocketPermissionRaw, 8, 32)
|
UnixSocketPermissionParsed, err := strconv.ParseUint(UnixSocketPermissionRaw, 8, 32)
|
||||||
if err != nil || UnixSocketPermissionParsed > 0777 {
|
if err != nil || UnixSocketPermissionParsed > 0777 {
|
||||||
log.Fatal(4, "Fail to parse unixSocketPermission: %s", UnixSocketPermissionRaw)
|
log.Fatal(4, "Fail to parse unixSocketPermission: %s", UnixSocketPermissionRaw)
|
||||||
}
|
}
|
||||||
UnixSocketPermission = uint32(UnixSocketPermissionParsed)
|
UnixSocketPermission = uint32(UnixSocketPermissionParsed)
|
||||||
|
}
|
||||||
|
Domain = sec.Key("DOMAIN").MustString("localhost")
|
||||||
|
HTTPAddr = sec.Key("HTTP_ADDR").MustString("0.0.0.0")
|
||||||
|
HTTPPort = sec.Key("HTTP_PORT").MustString("3000")
|
||||||
|
LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(string(Protocol) + "://localhost:" + HTTPPort + "/")
|
||||||
OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
|
OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
|
||||||
DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
|
DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
|
||||||
StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir)
|
StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir)
|
||||||
|
|
|
@ -153,7 +153,7 @@ func Install(ctx *context.Context) {
|
||||||
|
|
||||||
form.Domain = setting.Domain
|
form.Domain = setting.Domain
|
||||||
form.SSHPort = setting.SSH.Port
|
form.SSHPort = setting.SSH.Port
|
||||||
form.HTTPPort = setting.HttpPort
|
form.HTTPPort = setting.HTTPPort
|
||||||
form.AppUrl = setting.AppUrl
|
form.AppUrl = setting.AppUrl
|
||||||
form.LogRootPath = setting.LogRootPath
|
form.LogRootPath = setting.LogRootPath
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
0.9.73.0811
|
0.9.74.0811
|
Loading…
Reference in a new issue