Rename GetRes() which is not descriptive, to Kind()

This used to be GetType(), but since now things are "resources", we want
to know what "kind" they are, since asking what "type" they are is
confusing, and makes less logical sense than "Kind".
This commit is contained in:
James Shubin
2016-02-23 00:24:43 -05:00
parent a56fb3c8cd
commit 06635dfa75
6 changed files with 38 additions and 38 deletions

View File

@@ -58,7 +58,7 @@ func NewFileRes(name, path, dirname, basename, content, state string) *FileRes {
}
}
func (obj *FileRes) GetRes() string {
func (obj *FileRes) Kind() string {
return "File"
}
@@ -142,7 +142,7 @@ func (obj *FileRes) Watch() {
} else if err == syscall.ENOSPC {
// XXX: occasionally: no space left on device,
// XXX: probably due to lack of inotify watches
log.Printf("%v[%v]: Out of inotify watches!", obj.GetRes(), obj.GetName())
log.Printf("%v[%v]: Out of inotify watches!", obj.Kind(), obj.GetName())
log.Fatal(err)
} else {
log.Printf("Unknown file[%v] error:", obj.Name)
@@ -318,7 +318,7 @@ func (obj *FileRes) FileApply() error {
}
func (obj *FileRes) CheckApply(apply bool) (stateok bool, err error) {
log.Printf("%v[%v]: CheckApply(%t)", obj.GetRes(), obj.GetName(), apply)
log.Printf("%v[%v]: CheckApply(%t)", obj.Kind(), obj.GetName(), apply)
if obj.isStateOK { // cache the state
return true, nil