diff options
| -rw-r--r-- | linuxstatus/hostname.go | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/linuxstatus/hostname.go b/linuxstatus/hostname.go index 6853ba6..08c7971 100644 --- a/linuxstatus/hostname.go +++ b/linuxstatus/hostname.go @@ -22,21 +22,8 @@ func (ls *LinuxStatus) GetDomainName() string { return me.domainname.Get() } -func (ls *LinuxStatus) setDomainName(dn string) { +func (ls *LinuxStatus) setDomainName() { if ! me.Ready() {return} - me.domainname.Set(dn) -} - -func lookupHostname() { - if ! me.Ready() {return} - var err error - var s string = "gui.Label == nil" - s, err = fqdn.FqdnHostname() - if (err != nil) { - log.Error(err, "FQDN hostname error") - return - } - log.Error(errors.New("full hostname should be: " + s)) dn := run("domainname") if me.window == nil { @@ -47,16 +34,44 @@ func lookupHostname() { } if (me.domainname.Get() != dn) { log.Log(CHANGE, "domainname has changed from", me.GetDomainName(), "to", dn) - me.setDomainName(dn) + me.domainname.Set(dn) me.changed = true } +} + +func (ls *LinuxStatus) GetHostShort() string { + if ! me.Ready() {return ""} + if me.window == nil { + log.Log(NOW, "me.window == nil") + } else { + log.Log(NOW, "me.window exists, but has not been drawn") + } + return me.hostshort.Get() +} +func (ls *LinuxStatus) setHostShort() { + if ! me.Ready() {return ""} hshort := run("hostname -s") if (me.hostshort.Get() != hshort) { log.Log(CHANGE, "hostname -s has changed from", me.hostshort.Get(), "to", hshort) me.hostshort.Set(hshort) me.changed = true } +} + +func lookupHostname() { + if ! me.Ready() {return} + var err error + var s string = "gui.Label == nil" + s, err = fqdn.FqdnHostname() + if (err != nil) { + log.Error(err, "FQDN hostname error") + return + } + log.Error(errors.New("full hostname should be: " + s)) + + me.setDomainName() + /* var test string |