mirror of https://github.com/statping/statping
vue
parent
5794fc3c29
commit
765e481d27
22
core/core.go
22
core/core.go
|
@ -34,7 +34,7 @@ type PluginRepos types.PluginRepos
|
||||||
|
|
||||||
type Core struct {
|
type Core struct {
|
||||||
*types.Core
|
*types.Core
|
||||||
services []*Service
|
services map[int64]*Service
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -51,8 +51,8 @@ func init() {
|
||||||
func NewCore() *Core {
|
func NewCore() *Core {
|
||||||
CoreApp = &Core{Core: &types.Core{
|
CoreApp = &Core{Core: &types.Core{
|
||||||
Started: time.Now().UTC(),
|
Started: time.Now().UTC(),
|
||||||
},
|
}}
|
||||||
}
|
CoreApp.services = make(map[int64]*Service)
|
||||||
return CoreApp
|
return CoreApp
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -204,9 +204,17 @@ func GetLocalIP() string {
|
||||||
}
|
}
|
||||||
|
|
||||||
// ServiceOrder will reorder the services based on 'order_id' (Order)
|
// ServiceOrder will reorder the services based on 'order_id' (Order)
|
||||||
type ServiceOrder []*Service
|
type ServiceOrder map[int64]*Service
|
||||||
|
|
||||||
// Sort interface for resroting the Services in order
|
// Sort interface for resroting the Services in order
|
||||||
func (c ServiceOrder) Len() int { return len(c) }
|
func (c ServiceOrder) Len() int { return len(c) }
|
||||||
func (c ServiceOrder) Swap(i, j int) { c[i], c[j] = c[j], c[i] }
|
func (c ServiceOrder) Swap(i, j int) { c[int64(i)], c[int64(j)] = c[int64(j)], c[int64(i)] }
|
||||||
func (c ServiceOrder) Less(i, j int) bool { return c[i].Order < c[j].Order }
|
func (c ServiceOrder) Less(i, j int) bool {
|
||||||
|
if c[int64(i)] == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
if c[int64(j)] == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return c[int64(i)].Order < c[int64(j)].Order
|
||||||
|
}
|
||||||
|
|
|
@ -28,17 +28,15 @@ type Service struct {
|
||||||
*database.ServiceObj
|
*database.ServiceObj
|
||||||
}
|
}
|
||||||
|
|
||||||
func Services() []*Service {
|
func Services() map[int64]*Service {
|
||||||
return CoreApp.services
|
return CoreApp.services
|
||||||
}
|
}
|
||||||
|
|
||||||
// SelectService returns a *core.Service from in memory
|
// SelectService returns a *core.Service from in memory
|
||||||
func SelectService(id int64) *Service {
|
func SelectService(id int64) *Service {
|
||||||
for _, s := range Services() {
|
service := CoreApp.services[id]
|
||||||
if s.Id == id {
|
if service != nil {
|
||||||
s.UpdateStats()
|
return service
|
||||||
return s
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -57,8 +55,8 @@ func CheckinProcess(s database.Servicer) {
|
||||||
|
|
||||||
// SelectAllServices returns a slice of *core.Service to be store on []*core.Services
|
// SelectAllServices returns a slice of *core.Service to be store on []*core.Services
|
||||||
// should only be called once on startup.
|
// should only be called once on startup.
|
||||||
func SelectAllServices(start bool) ([]*Service, error) {
|
func SelectAllServices(start bool) (map[int64]*Service, error) {
|
||||||
var coreServices []*Service
|
services := make(map[int64]*Service)
|
||||||
if len(CoreApp.services) > 0 {
|
if len(CoreApp.services) > 0 {
|
||||||
return CoreApp.services, nil
|
return CoreApp.services, nil
|
||||||
}
|
}
|
||||||
|
@ -78,13 +76,14 @@ func SelectAllServices(start bool) ([]*Service, error) {
|
||||||
|
|
||||||
// collect initial service stats
|
// collect initial service stats
|
||||||
s.UpdateStats()
|
s.UpdateStats()
|
||||||
coreServices = append(coreServices, &Service{s})
|
|
||||||
|
services[s.Id] = &Service{s}
|
||||||
}
|
}
|
||||||
|
|
||||||
CoreApp.services = coreServices
|
CoreApp.services = services
|
||||||
reorderServices()
|
reorderServices()
|
||||||
|
|
||||||
return coreServices, nil
|
return services, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func wrapFailures(f []*types.Failure) []*Failure {
|
func wrapFailures(f []*types.Failure) []*Failure {
|
||||||
|
@ -97,35 +96,24 @@ func wrapFailures(f []*types.Failure) []*Failure {
|
||||||
|
|
||||||
// reorderServices will sort the services based on 'order_id'
|
// reorderServices will sort the services based on 'order_id'
|
||||||
func reorderServices() {
|
func reorderServices() {
|
||||||
|
fmt.Println("sorting: ", len(CoreApp.services))
|
||||||
sort.Sort(ServiceOrder(CoreApp.services))
|
sort.Sort(ServiceOrder(CoreApp.services))
|
||||||
}
|
}
|
||||||
|
|
||||||
// index returns a services index int for updating the []*core.Services slice
|
|
||||||
func index(s int64) int {
|
|
||||||
for k, service := range CoreApp.services {
|
|
||||||
if s == service.Id {
|
|
||||||
return k
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// updateService will update a service in the []*core.Services slice
|
// updateService will update a service in the []*core.Services slice
|
||||||
func updateService(s *Service) {
|
func updateService(s *Service) {
|
||||||
CoreApp.services[index(s.Id)] = s
|
CoreApp.services[s.Id] = s
|
||||||
}
|
}
|
||||||
|
|
||||||
// Delete will remove a service from the database, it will also end the service checking go routine
|
// Delete will remove a service from the database, it will also end the service checking go routine
|
||||||
func (s *Service) Delete() error {
|
func (s *Service) Delete() error {
|
||||||
i := index(s.Id)
|
|
||||||
err := database.Delete(s)
|
err := database.Delete(s)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Errorln(fmt.Sprintf("Failed to delete service %v. %v", s.Name, err))
|
log.Errorln(fmt.Sprintf("Failed to delete service %v. %v", s.Name, err))
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
s.Close()
|
s.Close()
|
||||||
slice := CoreApp.services
|
CoreApp.services[s.Id] = nil
|
||||||
CoreApp.services = append(slice[:i], slice[i+1:]...)
|
|
||||||
reorderServices()
|
reorderServices()
|
||||||
notifier.OnDeletedService(s.Service)
|
notifier.OnDeletedService(s.Service)
|
||||||
return err
|
return err
|
||||||
|
@ -168,7 +156,7 @@ func Create(srv database.Servicer, check bool) (int64, error) {
|
||||||
}
|
}
|
||||||
service := &Service{s}
|
service := &Service{s}
|
||||||
s.Start()
|
s.Start()
|
||||||
CoreApp.services = append(CoreApp.services, service)
|
CoreApp.services[service.Id] = service
|
||||||
go ServiceCheckQueue(service, check)
|
go ServiceCheckQueue(service, check)
|
||||||
reorderServices()
|
reorderServices()
|
||||||
notifier.OnNewService(s.Service)
|
notifier.OnNewService(s.Service)
|
||||||
|
|
|
@ -206,7 +206,7 @@ func apiAllServicesHandler(r *http.Request) interface{} {
|
||||||
return joinServices(services)
|
return joinServices(services)
|
||||||
}
|
}
|
||||||
|
|
||||||
func joinServices(srvs []*core.Service) []*types.Service {
|
func joinServices(srvs map[int64]*core.Service) []*types.Service {
|
||||||
var services []*types.Service
|
var services []*types.Service
|
||||||
for _, v := range srvs {
|
for _, v := range srvs {
|
||||||
v.UpdateStats()
|
v.UpdateStats()
|
||||||
|
|
Loading…
Reference in New Issue