Unknown
10 years ago
parent
8d3276cab0
commit
f147ad619a
@ -1,6 +0,0 @@
|
||||
package models
|
||||
|
||||
func Fix() error {
|
||||
_, err := orm.Exec("alter table repository drop column num_releases")
|
||||
return err
|
||||
}
|
||||
@ -0,0 +1,89 @@
|
||||
// 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 process
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"fmt"
|
||||
"os/exec"
|
||||
"time"
|
||||
|
||||
"github.com/gogits/gogs/modules/log"
|
||||
)
|
||||
|
||||
// Process represents a working process inherit from Gogs.
|
||||
type Process struct {
|
||||
Pid int64 // Process ID, not system one.
|
||||
Description string
|
||||
Start time.Time
|
||||
Cmd *exec.Cmd
|
||||
}
|
||||
|
||||
// List of existing processes.
|
||||
var (
|
||||
curPid int64 = 1
|
||||
Processes []*Process
|
||||
)
|
||||
|
||||
// Add adds a existing process and returns its PID.
|
||||
func Add(desc string, cmd *exec.Cmd) int64 {
|
||||
pid := curPid
|
||||
Processes = append(Processes, &Process{
|
||||
Pid: pid,
|
||||
Description: desc,
|
||||
Start: time.Now(),
|
||||
Cmd: cmd,
|
||||
})
|
||||
curPid++
|
||||
return pid
|
||||
}
|
||||
|
||||
func ExecDir(dir, desc, cmdName string, args ...string) (string, string, error) {
|
||||
bufOut := new(bytes.Buffer)
|
||||
bufErr := new(bytes.Buffer)
|
||||
|
||||
cmd := exec.Command(cmdName, args...)
|
||||
cmd.Dir = dir
|
||||
cmd.Stdout = bufOut
|
||||
cmd.Stderr = bufErr
|
||||
|
||||
pid := Add(desc, cmd)
|
||||
err := cmd.Run()
|
||||
if errKill := Kill(pid); errKill != nil {
|
||||
log.Error("Exec: %v", pid, desc, errKill)
|
||||
}
|
||||
return bufOut.String(), bufErr.String(), err
|
||||
}
|
||||
|
||||
// Exec starts executing a command and record its process.
|
||||
func Exec(desc, cmdName string, args ...string) (string, string, error) {
|
||||
return ExecDir("", desc, cmdName, args...)
|
||||
}
|
||||
|
||||
// Remove removes a process from list.
|
||||
func Remove(pid int64) {
|
||||
for i, proc := range Processes {
|
||||
if proc.Pid == pid {
|
||||
Processes = append(Processes[:i], Processes[i+1:]...)
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Kill kills and removes a process from list.
|
||||
func Kill(pid int64) error {
|
||||
for i, proc := range Processes {
|
||||
if proc.Pid == pid {
|
||||
if proc.Cmd.Process != nil && proc.Cmd.ProcessState != nil && !proc.Cmd.ProcessState.Exited() {
|
||||
if err := proc.Cmd.Process.Kill(); err != nil {
|
||||
return fmt.Errorf("fail to kill process(%d/%s): %v", proc.Pid, proc.Description, err)
|
||||
}
|
||||
}
|
||||
Processes = append(Processes[:i], Processes[i+1:]...)
|
||||
return nil
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
@ -1 +1 @@
|
||||
0.4.4.0613 Alpha
|
||||
0.4.4.0619 Alpha
|
||||
@ -0,0 +1,38 @@
|
||||
{{template "base/head" .}}
|
||||
{{template "base/navbar" .}}
|
||||
<div id="body" class="container" data-page="admin">
|
||||
{{template "admin/nav" .}}
|
||||
<div id="admin-container" class="col-md-10">
|
||||
<ul class="nav nav-tabs">
|
||||
<li{{if .PageIsMonitorCron}} class="active"{{end}}><a href="/admin/monitor">Cron Tasks</a></li>
|
||||
<li{{if .PageIsMonitorProcess}} class="active"{{end}}><a href="/admin/monitor?tab=process">Processes</a></li>
|
||||
</ul>
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-body">
|
||||
{{if .PageIsMonitorProcess}}
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Pid</th>
|
||||
<th>Description</th>
|
||||
<th>Start Time</th>
|
||||
<th>Execution Time</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{range .Processes}}
|
||||
<tr>
|
||||
<td>{{.Pid}}</td>
|
||||
<td>{{.Description}}</td>
|
||||
<td>{{.Start}}</td>
|
||||
<td>{{TimeSince .Start}}</td>
|
||||
</tr>
|
||||
{{end}}
|
||||
</tbody>
|
||||
</table>
|
||||
{{end}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{{template "base/footer" .}}
|
||||
Loading…
Reference in new issue