|
|
@@ -27,15 +27,15 @@ import ( |
|
|
"log"
|
|
|
)
|
|
|
|
|
|
-type ServiceType struct {
|
|
|
- BaseType `yaml:",inline"`
|
|
|
- State string `yaml:"state"` // state: running, stopped
|
|
|
- Startup string `yaml:"startup"` // enabled, disabled, undefined
|
|
|
+type SvcRes struct {
|
|
|
+ BaseRes `yaml:",inline"`
|
|
|
+ State string `yaml:"state"` // state: running, stopped
|
|
|
+ Startup string `yaml:"startup"` // enabled, disabled, undefined
|
|
|
}
|
|
|
|
|
|
-func NewServiceType(name, state, startup string) *ServiceType {
|
|
|
- return &ServiceType{
|
|
|
- BaseType: BaseType{
|
|
|
+func NewSvcRes(name, state, startup string) *SvcRes {
|
|
|
+ return &SvcRes{
|
|
|
+ BaseRes: BaseRes{
|
|
|
Name: name,
|
|
|
events: make(chan Event),
|
|
|
vertex: nil,
|
|
|
@@ -45,19 +45,19 @@ func NewServiceType(name, state, startup string) *ServiceType { |
|
|
}
|
|
|
}
|
|
|
|
|
|
-func (obj *ServiceType) GetType() string {
|
|
|
- return "Service"
|
|
|
+func (obj *SvcRes) GetRes() string {
|
|
|
+ return "Svc"
|
|
|
}
|
|
|
|
|
|
// Service watcher
|
|
|
-func (obj *ServiceType) Watch() {
|
|
|
+func (obj *SvcRes) Watch() {
|
|
|
if obj.IsWatching() {
|
|
|
return
|
|
|
}
|
|
|
obj.SetWatching(true)
|
|
|
defer obj.SetWatching(false)
|
|
|
|
|
|
- // obj.Name: service name
|
|
|
+ // obj.Name: svc name
|
|
|
//vertex := obj.GetVertex() // stored with SetVertex
|
|
|
if !util.IsRunningSystemd() {
|
|
|
log.Fatal("Systemd is not running.")
|
|
|
@@ -80,11 +80,11 @@ func (obj *ServiceType) Watch() { |
|
|
buschan := make(chan *dbus.Signal, 10)
|
|
|
bus.Signal(buschan)
|
|
|
|
|
|
- var service = fmt.Sprintf("%v.service", obj.Name) // systemd name
|
|
|
- var send = false // send event?
|
|
|
+ var svc = fmt.Sprintf("%v.service", obj.Name) // systemd name
|
|
|
+ var send = false // send event?
|
|
|
var exit = false
|
|
|
var dirty = false
|
|
|
- var invalid = false // does the service exist or not?
|
|
|
+ var invalid = false // does the svc exist or not?
|
|
|
var previous bool // previous invalid value
|
|
|
set := conn.NewSubscriptionSet() // no error should be returned
|
|
|
subChannel, subErrors := set.Subscribe()
|
|
|
@@ -97,8 +97,8 @@ func (obj *ServiceType) Watch() { |
|
|
previous = invalid
|
|
|
invalid = false
|
|
|
|
|
|
- // firstly, does service even exist or not?
|
|
|
- loadstate, err := conn.GetUnitProperty(service, "LoadState")
|
|
|
+ // firstly, does svc even exist or not?
|
|
|
+ loadstate, err := conn.GetUnitProperty(svc, "LoadState")
|
|
|
if err != nil {
|
|
|
log.Printf("Failed to get property: %v", err)
|
|
|
invalid = true
|
|
|
@@ -107,7 +107,7 @@ func (obj *ServiceType) Watch() { |
|
|
if !invalid {
|
|
|
var notFound = (loadstate.Value == dbus.MakeVariant("not-found"))
|
|
|
if notFound { // XXX: in the loop we'll handle changes better...
|
|
|
- log.Printf("Failed to find service: %v", service)
|
|
|
+ log.Printf("Failed to find svc: %v", svc)
|
|
|
invalid = true // XXX ?
|
|
|
}
|
|
|
}
|
|
|
@@ -118,21 +118,21 @@ func (obj *ServiceType) Watch() { |
|
|
}
|
|
|
|
|
|
if invalid {
|
|
|
- log.Printf("Waiting for: %v", service) // waiting for service to appear...
|
|
|
+ log.Printf("Waiting for: %v", svc) // waiting for svc to appear...
|
|
|
if activeSet {
|
|
|
activeSet = false
|
|
|
- set.Remove(service) // no return value should ever occur
|
|
|
+ set.Remove(svc) // no return value should ever occur
|
|
|
}
|
|
|
|
|
|
- obj.SetState(typeWatching) // reset
|
|
|
+ obj.SetState(resStateWatching) // reset
|
|
|
select {
|
|
|
case _ = <-buschan: // XXX wait for new units event to unstick
|
|
|
- obj.SetConvergedState(typeConvergedNil)
|
|
|
+ obj.SetConvergedState(resConvergedNil)
|
|
|
// loop so that we can see the changed invalid signal
|
|
|
- log.Printf("Service[%v]->DaemonReload()", service)
|
|
|
+ log.Printf("Svc[%v]->DaemonReload()", svc)
|
|
|
|
|
|
case event := <-obj.events:
|
|
|
- obj.SetConvergedState(typeConvergedNil)
|
|
|
+ obj.SetConvergedState(resConvergedNil)
|
|
|
if exit, send = obj.ReadEvent(&event); exit {
|
|
|
return // exit
|
|
|
}
|
|
|
@@ -141,47 +141,47 @@ func (obj *ServiceType) Watch() { |
|
|
}
|
|
|
|
|
|
case _ = <-TimeAfterOrBlock(obj.ctimeout):
|
|
|
- obj.SetConvergedState(typeConvergedTimeout)
|
|
|
+ obj.SetConvergedState(resConvergedTimeout)
|
|
|
obj.converged <- true
|
|
|
continue
|
|
|
}
|
|
|
} else {
|
|
|
if !activeSet {
|
|
|
activeSet = true
|
|
|
- set.Add(service) // no return value should ever occur
|
|
|
+ set.Add(svc) // no return value should ever occur
|
|
|
}
|
|
|
|
|
|
- log.Printf("Watching: %v", service) // attempting to watch...
|
|
|
- obj.SetState(typeWatching) // reset
|
|
|
+ log.Printf("Watching: %v", svc) // attempting to watch...
|
|
|
+ obj.SetState(resStateWatching) // reset
|
|
|
select {
|
|
|
case event := <-subChannel:
|
|
|
|
|
|
- log.Printf("Service event: %+v", event)
|
|
|
+ log.Printf("Svc event: %+v", event)
|
|
|
// NOTE: the value returned is a map for some reason...
|
|
|
- if event[service] != nil {
|
|
|
- // event[service].ActiveState is not nil
|
|
|
- if event[service].ActiveState == "active" {
|
|
|
- log.Printf("Service[%v]->Started()", service)
|
|
|
- } else if event[service].ActiveState == "inactive" {
|
|
|
- log.Printf("Service[%v]->Stopped!()", service)
|
|
|
+ if event[svc] != nil {
|
|
|
+ // event[svc].ActiveState is not nil
|
|
|
+ if event[svc].ActiveState == "active" {
|
|
|
+ log.Printf("Svc[%v]->Started()", svc)
|
|
|
+ } else if event[svc].ActiveState == "inactive" {
|
|
|
+ log.Printf("Svc[%v]->Stopped!()", svc)
|
|
|
} else {
|
|
|
- log.Fatal("Unknown service state: ", event[service].ActiveState)
|
|
|
+ log.Fatal("Unknown svc state: ", event[svc].ActiveState)
|
|
|
}
|
|
|
} else {
|
|
|
- // service stopped (and ActiveState is nil...)
|
|
|
- log.Printf("Service[%v]->Stopped", service)
|
|
|
+ // svc stopped (and ActiveState is nil...)
|
|
|
+ log.Printf("Svc[%v]->Stopped", svc)
|
|
|
}
|
|
|
send = true
|
|
|
dirty = true
|
|
|
|
|
|
case err := <-subErrors:
|
|
|
- obj.SetConvergedState(typeConvergedNil) // XXX ?
|
|
|
+ obj.SetConvergedState(resConvergedNil) // XXX ?
|
|
|
log.Println("error:", err)
|
|
|
log.Fatal(err)
|
|
|
- //vertex.events <- fmt.Sprintf("service: %v", "error") // XXX: how should we handle errors?
|
|
|
+ //vertex.events <- fmt.Sprintf("svc: %v", "error") // XXX: how should we handle errors?
|
|
|
|
|
|
case event := <-obj.events:
|
|
|
- obj.SetConvergedState(typeConvergedNil)
|
|
|
+ obj.SetConvergedState(resConvergedNil)
|
|
|
if exit, send = obj.ReadEvent(&event); exit {
|
|
|
return // exit
|
|
|
}
|
|
|
@@ -203,7 +203,7 @@ func (obj *ServiceType) Watch() { |
|
|
}
|
|
|
}
|
|
|
|
|
|
-func (obj *ServiceType) StateOK() bool {
|
|
|
+func (obj *SvcRes) StateOK() bool {
|
|
|
if obj.isStateOK { // cache the state
|
|
|
return true
|
|
|
}
|
|
|
@@ -218,9 +218,9 @@ func (obj *ServiceType) StateOK() bool { |
|
|
}
|
|
|
defer conn.Close()
|
|
|
|
|
|
- var service = fmt.Sprintf("%v.service", obj.Name) // systemd name
|
|
|
+ var svc = fmt.Sprintf("%v.service", obj.Name) // systemd name
|
|
|
|
|
|
- loadstate, err := conn.GetUnitProperty(service, "LoadState")
|
|
|
+ loadstate, err := conn.GetUnitProperty(svc, "LoadState")
|
|
|
if err != nil {
|
|
|
log.Printf("Failed to get load state: %v", err)
|
|
|
return false
|
|
|
@@ -229,14 +229,14 @@ func (obj *ServiceType) StateOK() bool { |
|
|
// NOTE: we have to compare variants with other variants, they are really strings...
|
|
|
var notFound = (loadstate.Value == dbus.MakeVariant("not-found"))
|
|
|
if notFound {
|
|
|
- log.Printf("Failed to find service: %v", service)
|
|
|
+ log.Printf("Failed to find svc: %v", svc)
|
|
|
return false
|
|
|
}
|
|
|
|
|
|
- // XXX: check service "enabled at boot" or not status...
|
|
|
+ // XXX: check svc "enabled at boot" or not status...
|
|
|
|
|
|
- //conn.GetUnitProperties(service)
|
|
|
- activestate, err := conn.GetUnitProperty(service, "ActiveState")
|
|
|
+ //conn.GetUnitProperties(svc)
|
|
|
+ activestate, err := conn.GetUnitProperty(svc, "ActiveState")
|
|
|
if err != nil {
|
|
|
log.Fatal("Failed to get active state: ", err)
|
|
|
}
|
|
|
@@ -258,8 +258,8 @@ func (obj *ServiceType) StateOK() bool { |
|
|
return true // all is good, no state change needed
|
|
|
}
|
|
|
|
|
|
-func (obj *ServiceType) Apply() bool {
|
|
|
- log.Printf("%v[%v]: Apply", obj.GetType(), obj.GetName())
|
|
|
+func (obj *SvcRes) Apply() bool {
|
|
|
+ log.Printf("%v[%v]: Apply", obj.GetRes(), obj.GetName())
|
|
|
|
|
|
if !util.IsRunningSystemd() {
|
|
|
log.Fatal("Systemd is not running.")
|
|
|
@@ -271,8 +271,8 @@ func (obj *ServiceType) Apply() bool { |
|
|
}
|
|
|
defer conn.Close()
|
|
|
|
|
|
- var service = fmt.Sprintf("%v.service", obj.Name) // systemd name
|
|
|
- var files = []string{service} // the service represented in a list
|
|
|
+ var svc = fmt.Sprintf("%v.service", obj.Name) // systemd name
|
|
|
+ var files = []string{svc} // the svc represented in a list
|
|
|
if obj.Startup == "enabled" {
|
|
|
_, _, err = conn.EnableUnitFiles(files, false, true)
|
|
|
|
|
|
@@ -289,13 +289,13 @@ func (obj *ServiceType) Apply() bool { |
|
|
result := make(chan string, 1) // catch result information
|
|
|
|
|
|
if obj.State == "running" {
|
|
|
- _, err := conn.StartUnit(service, "fail", result)
|
|
|
+ _, err := conn.StartUnit(svc, "fail", result)
|
|
|
if err != nil {
|
|
|
log.Fatal("Failed to start unit: ", err)
|
|
|
return false
|
|
|
}
|
|
|
} else if obj.State == "stopped" {
|
|
|
- _, err = conn.StopUnit(service, "fail", result)
|
|
|
+ _, err = conn.StopUnit(svc, "fail", result)
|
|
|
if err != nil {
|
|
|
log.Fatal("Failed to stop unit: ", err)
|
|
|
return false
|
|
|
@@ -319,17 +319,17 @@ func (obj *ServiceType) Apply() bool { |
|
|
return true
|
|
|
}
|
|
|
|
|
|
-func (obj *ServiceType) Compare(typ Type) bool {
|
|
|
- switch typ.(type) {
|
|
|
- case *ServiceType:
|
|
|
- typ := typ.(*ServiceType)
|
|
|
- if obj.Name != typ.Name {
|
|
|
+func (obj *SvcRes) Compare(res Res) bool {
|
|
|
+ switch res.(type) {
|
|
|
+ case *SvcRes:
|
|
|
+ res := res.(*SvcRes)
|
|
|
+ if obj.Name != res.Name {
|
|
|
return false
|
|
|
}
|
|
|
- if obj.State != typ.State {
|
|
|
+ if obj.State != res.State {
|
|
|
return false
|
|
|
}
|
|
|
- if obj.Startup != typ.Startup {
|
|
|
+ if obj.Startup != res.Startup {
|
|
|
return false
|
|
|
}
|
|
|
default:
|
|
|
|