mirror of
https://github.com/ScuroNeko/mtg.git
synced 2026-08-31 21:44:03 +03:00
Add base stats
This commit is contained in:
Generated
+7
-1
@@ -22,6 +22,12 @@
|
|||||||
revision = "346938d642f2ec3594ed81d874461961cd0faa76"
|
revision = "346938d642f2ec3594ed81d874461961cd0faa76"
|
||||||
version = "v1.1.0"
|
version = "v1.1.0"
|
||||||
|
|
||||||
|
[[projects]]
|
||||||
|
branch = "master"
|
||||||
|
name = "github.com/dustin/go-humanize"
|
||||||
|
packages = ["."]
|
||||||
|
revision = "02af3965c54e8cacf948b97fef38925c4120652c"
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
branch = "master"
|
branch = "master"
|
||||||
name = "github.com/juju/errors"
|
name = "github.com/juju/errors"
|
||||||
@@ -80,6 +86,6 @@
|
|||||||
[solve-meta]
|
[solve-meta]
|
||||||
analyzer-name = "dep"
|
analyzer-name = "dep"
|
||||||
analyzer-version = 1
|
analyzer-version = 1
|
||||||
inputs-digest = "24afdd6b64331aeba47fed75918d04032e13e404612cac107bad1d68a5038b72"
|
inputs-digest = "312c9fb15085cbe9660443b15a07981990e1f70ec3ddfcce1b7e6cd5902307da"
|
||||||
solver-name = "gps-cdcl"
|
solver-name = "gps-cdcl"
|
||||||
solver-version = 1
|
solver-version = 1
|
||||||
|
|||||||
@@ -44,3 +44,7 @@
|
|||||||
[[constraint]]
|
[[constraint]]
|
||||||
name = "github.com/satori/go.uuid"
|
name = "github.com/satori/go.uuid"
|
||||||
version = "1.2.0"
|
version = "1.2.0"
|
||||||
|
|
||||||
|
[[constraint]]
|
||||||
|
branch = "master"
|
||||||
|
name = "github.com/dustin/go-humanize"
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import (
|
|||||||
|
|
||||||
"github.com/9seconds/mtg/config"
|
"github.com/9seconds/mtg/config"
|
||||||
"github.com/9seconds/mtg/proxy"
|
"github.com/9seconds/mtg/proxy"
|
||||||
|
"github.com/9seconds/mtg/stats"
|
||||||
"github.com/juju/errors"
|
"github.com/juju/errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -115,13 +116,15 @@ func main() {
|
|||||||
zap.ReplaceGlobals(logger)
|
zap.ReplaceGlobals(logger)
|
||||||
defer logger.Sync()
|
defer logger.Sync()
|
||||||
|
|
||||||
|
printURLs(conf.GetURLs())
|
||||||
|
|
||||||
if conf.UseMiddleProxy() {
|
if conf.UseMiddleProxy() {
|
||||||
zap.S().Infow("Use middle proxy connection to Telegram")
|
zap.S().Infow("Use middle proxy connection to Telegram")
|
||||||
} else {
|
} else {
|
||||||
zap.S().Infow("Use direct connection to Telegram")
|
zap.S().Infow("Use direct connection to Telegram")
|
||||||
}
|
}
|
||||||
|
|
||||||
printURLs(conf.GetURLs())
|
go stats.Start(conf)
|
||||||
|
|
||||||
server := proxy.NewProxy(conf)
|
server := proxy.NewProxy(conf)
|
||||||
if err := server.Serve(); err != nil {
|
if err := server.Serve(); err != nil {
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package stats
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"net/http"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/9seconds/mtg/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
var instance *stats
|
||||||
|
|
||||||
|
func Start(conf *config.Config) {
|
||||||
|
instance = &stats{
|
||||||
|
URLs: conf.GetURLs(),
|
||||||
|
Uptime: uptime(time.Now()),
|
||||||
|
speedCurrent: &speed{},
|
||||||
|
mutex: &sync.RWMutex{},
|
||||||
|
}
|
||||||
|
|
||||||
|
http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
instance.mutex.Lock()
|
||||||
|
first, _ := json.Marshal(instance)
|
||||||
|
instance.mutex.Unlock()
|
||||||
|
|
||||||
|
interm := map[string]interface{}{}
|
||||||
|
json.Unmarshal(first, &interm)
|
||||||
|
|
||||||
|
encoder := json.NewEncoder(w)
|
||||||
|
encoder.SetEscapeHTML(false)
|
||||||
|
encoder.SetIndent("", " ")
|
||||||
|
encoder.Encode(interm)
|
||||||
|
})
|
||||||
|
|
||||||
|
http.ListenAndServe(conf.StatAddr(), nil)
|
||||||
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
package stats
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
humanize "github.com/dustin/go-humanize"
|
||||||
|
|
||||||
|
"github.com/9seconds/mtg/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
type uptime time.Time
|
||||||
|
|
||||||
|
func (u uptime) MarshalJSON() ([]byte, error) {
|
||||||
|
duration := time.Since(time.Time(u))
|
||||||
|
value := map[string]string{
|
||||||
|
"seconds": strconv.Itoa(int(duration.Seconds())),
|
||||||
|
"human": humanize.Time(time.Time(u)),
|
||||||
|
}
|
||||||
|
|
||||||
|
return json.Marshal(value)
|
||||||
|
}
|
||||||
|
|
||||||
|
type trafficValue uint64
|
||||||
|
|
||||||
|
func (t trafficValue) MarshalJSON() ([]byte, error) {
|
||||||
|
tv := uint64(t)
|
||||||
|
value := map[string]interface{}{
|
||||||
|
"bytes": tv,
|
||||||
|
"human": humanize.Bytes(tv),
|
||||||
|
}
|
||||||
|
|
||||||
|
return json.Marshal(value)
|
||||||
|
}
|
||||||
|
|
||||||
|
type trafficSpeedValue uint64
|
||||||
|
|
||||||
|
func (t trafficSpeedValue) MarshalJSON() ([]byte, error) {
|
||||||
|
speed := uint64(t)
|
||||||
|
value := map[string]interface{}{
|
||||||
|
"bytes/s": speed,
|
||||||
|
"human": fmt.Sprintf("%s/S", humanize.Bytes(speed)),
|
||||||
|
}
|
||||||
|
|
||||||
|
return json.Marshal(value)
|
||||||
|
}
|
||||||
|
|
||||||
|
type connections struct {
|
||||||
|
All uint32 `json:"all"`
|
||||||
|
Abridged uint32 `json:"abridged"`
|
||||||
|
Intermediate uint32 `json:"intermediate"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type traffic struct {
|
||||||
|
Ingress trafficValue `json:"ingress"`
|
||||||
|
Egress trafficValue `json:"egress"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type speed struct {
|
||||||
|
Ingress trafficSpeedValue `json:"ingress"`
|
||||||
|
Egress trafficSpeedValue `json:"egress"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type stats struct {
|
||||||
|
URLs config.IPURLs `json:"urls"`
|
||||||
|
ActiveConnections connections `json:"active_connections"`
|
||||||
|
AllConnections connections `json:"all_connections"`
|
||||||
|
Traffic traffic `json:"traffic"`
|
||||||
|
Speed speed `json:"speed"`
|
||||||
|
Uptime uptime `json:"uptime"`
|
||||||
|
|
||||||
|
speedCurrent *speed
|
||||||
|
mutex *sync.RWMutex
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user