OpenPDU/openpdu
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

config in its own package

Browse Source
This commit is contained in:
Paolo Asperti 2022-06-03 12:43:31 +02:00
parent 1098116513
commit 9a7eef618f
Signed by: paspo
GPG Key ID: 06D46905D19D5182
15 changed files with 170 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/board/board_i2c.go
View File

@ -6,6 +6,7 @@ import (
"strings"
"time"
"git.openpdu.org/OpenPDU/openpdu/config"
"git.openpdu.org/OpenPDU/openpdu/i2c"
"git.openpdu.org/OpenPDU/openpdu/syslog"
PahoMQTT "github.com/eclipse/paho.mqtt.golang"
@ -179,8 +180,8 @@ func (c *I2CChannel) ToString() string {
func (c *I2CChannel) SaveLastState() {
if c.onboot == "last" {
s := fmt.Sprintf("boards.%s.channels.%s.lastvalue", c.parent.ID, c.ID)
viper.Set(s, c.Status())
viper.WriteConfig()
config.Set(s, c.Status())
config.WriteConfig()
}
}
@ -314,7 +315,7 @@ func (b *I2CBoard) Initialize() {
case "last":
s := fmt.Sprintf("boards.%s.channels.%s.lastvalue", c.parent.ID, c.ID)
switch viper.GetBool(s) {
switch config.GetBool(s) {
case true:
c.SetOn()
case false:
@ -342,19 +343,19 @@ func (c *I2CChannel) OnBoot() string {
func (c *I2CChannel) SetOnBoot(str string) {
c.onboot = str
s := fmt.Sprintf("boards.%s.channels.%s.onboot", c.parent.ID, c.ID)
viper.Set(s, str)
config.Set(s, str)
}
func (c *I2CChannel) SetMQTTStateTopic(str string) {
c.mqttStateTopic = str
s := fmt.Sprintf("boards.%s.channels.%s.mqtt.statetopic", c.parent.ID, c.ID)
viper.Set(s, str)
config.Set(s, str)
}
func (c *I2CChannel) SetMQTTCommandTopic(str string) {
c.mqttCommandTopic = str
s := fmt.Sprintf("boards.%s.channels.%s.mqtt.commandtopic", c.parent.ID, c.ID)
viper.Set(s, str)
config.Set(s, str)
}
func (c *I2CChannel) MQTTHandler(client PahoMQTT.Client, msg PahoMQTT.Message) {

11
src/board/board_mqtt.go
View File

@ -6,6 +6,7 @@ import (
"strings"
"time"
"git.openpdu.org/OpenPDU/openpdu/config"
"git.openpdu.org/OpenPDU/openpdu/syslog"
PahoMQTT "github.com/eclipse/paho.mqtt.golang"
"github.com/spf13/viper"
@ -174,8 +175,8 @@ func (c *MQTTChannel) ToString() string {
func (c *MQTTChannel) SaveLastState() {
if c.onboot == "last" {
s := fmt.Sprintf("boards.%s.channels.%s.lastvalue", c.parent.ID, c.ID)
viper.Set(s, c.value)
viper.WriteConfig()
config.Set(s, c.value)
config.WriteConfig()
}
}
@ -315,19 +316,19 @@ func (c *MQTTChannel) OnBoot() string {
func (c *MQTTChannel) SetOnBoot(str string) {
c.onboot = str
s := fmt.Sprintf("boards.%s.channels.%s.onboot", c.parent.ID, c.ID)
viper.Set(s, str)
config.Set(s, str)
}
func (c *MQTTChannel) SetMQTTStateTopic(str string) {
c.mqttStateTopic = str
s := fmt.Sprintf("boards.%s.channels.%s.mqtt.statetopic", c.parent.ID, c.ID)
viper.Set(s, str)
config.Set(s, str)
}
func (c *MQTTChannel) SetMQTTCommandTopic(str string) {
c.mqttCommandTopic = str
s := fmt.Sprintf("boards.%s.channels.%s.mqtt.commandtopic", c.parent.ID, c.ID)
viper.Set(s, str)
config.Set(s, str)
}
func (c *MQTTChannel) MQTTStateTopic() string {

35
src/config.go → src/config/config.go
View File

@ -1,9 +1,8 @@
package main
package config
import (
"fmt"
"log"
"git.openpdu.org/OpenPDU/openpdu/syslog"
"github.com/spf13/viper"
)
@ -14,7 +13,7 @@ func init() {
viper.AddConfigPath("/etc/openpdu/") // path to look for the config file in
err := viper.ReadInConfig() // Find and read the config file
if err != nil { // Handle errors reading the config file
syslog.Err(fmt.Sprintf("Can't read config file: %s \n", err.Error()))
log.Printf("Can't read config file: %s \n", err.Error())
}
// temporary disabled because it screwsup the config on save
@ -25,3 +24,31 @@ func init() {
// })
// viper.WatchConfig()
}
func SetDefault(k string, v interface{}) {
viper.SetDefault(k, v)
}
func GetString(k string) string {
return viper.GetString(k)
}
func GetInt(k string) int {
return viper.GetInt(k)
}
func GetBool(k string) bool {
return viper.GetBool(k)
}
func Set(k string, v interface{}) {
viper.Set(k, v)
}
func WriteConfig() {
viper.WriteConfig()
}
func ConfigFileUsed() string {
return viper.ConfigFileUsed()
}

32
src/display.go
View File

@ -7,10 +7,11 @@ import (
"net"
"time"
"git.openpdu.org/OpenPDU/openpdu/config"
"git.openpdu.org/OpenPDU/openpdu/i2c"
"git.openpdu.org/OpenPDU/openpdu/outlet"
"git.openpdu.org/OpenPDU/openpdu/syslog"
"github.com/spf13/viper"
"golang.org/x/image/font"
"golang.org/x/image/font/basicfont"
"golang.org/x/image/math/fixed"
@ -19,24 +20,23 @@ import (
func init() {
syslog.Info("display setup")
viper.SetDefault("Display.Type", "none")
viper.SetDefault("Display.W", 128)
viper.SetDefault("Display.H", 32)
viper.SetDefault("Display.Rotated", false)
viper.SetDefault("Display.SwapTopBottom", false)
viper.SetDefault("Display.networkinterface", "eth0")
config.SetDefault("Display.Type", "none")
config.SetDefault("Display.W", 128)
config.SetDefault("Display.H", 32)
config.SetDefault("Display.Rotated", false)
config.SetDefault("Display.SwapTopBottom", false)
config.SetDefault("Display.networkinterface", "eth0")
}
func displayLoop() {
for {
syslog.Info("ssd1306 display starting loop")
if viper.GetString("Display.Type") != "ssd1306" {
syslog.Warning("ssd1306 disabled")
if config.GetString("Display.Type") != "ssd1306" {
time.Sleep(1 * time.Second)
continue
}
syslog.Info("ssd1306 display starting loop")
if i2c.I2Cbus == nil {
syslog.Warning("ssd1306 i2cbus not found")
time.Sleep(1 * time.Second)
@ -44,11 +44,11 @@ func displayLoop() {
}
opts := ssd1306.Opts{
W: viper.GetInt("Display.W"),
H: viper.GetInt("Display.H"),
Rotated: viper.GetBool("Display.Rotated"),
W: config.GetInt("Display.W"),
H: config.GetInt("Display.H"),
Rotated: config.GetBool("Display.Rotated"),
Sequential: true,
SwapTopBottom: viper.GetBool("Display.SwapTopBottom"),
SwapTopBottom: config.GetBool("Display.SwapTopBottom"),
}
// Open a handle to a ssd1306 connected on the I²C bus:
@ -128,7 +128,7 @@ func dispOutletStatusString() string {
func disp(dev *ssd1306.Dev) error {
img := image.NewRGBA(image.Rect(0, 0, 128, 32))
iface := viper.GetString("Display.NetworkInterface")
iface := config.GetString("Display.NetworkInterface")
ips := getIPs()
ip, found := ips[iface]
if !found {

6
src/main.go
View File

@ -1,16 +1,16 @@
package main
import (
"git.openpdu.org/OpenPDU/openpdu/config"
"git.openpdu.org/OpenPDU/openpdu/syslog"
"git.openpdu.org/OpenPDU/openpdu/ups"
"git.openpdu.org/OpenPDU/openpdu/webui"
"github.com/spf13/viper"
)
const version = "0.1"
func init() {
viper.SetDefault("system.hostname", "openpdu")
config.SetDefault("system.hostname", "openpdu")
}
func main() {
@ -21,7 +21,7 @@ func main() {
go MQTTRefreshLoop()
go ups.UpsConnect()
go displayLoop()
syslog.Info("hostname: " + viper.GetString("system.hostname"))
syslog.Info("hostname: " + config.GetString("system.hostname"))
webui.StartServer()
}

40
src/mqtt/mqtt.go
View File

@ -4,25 +4,25 @@ import (
"fmt"
"time"
"git.openpdu.org/OpenPDU/openpdu/config"
"git.openpdu.org/OpenPDU/openpdu/syslog"
MQTT "github.com/eclipse/paho.mqtt.golang"
"github.com/spf13/viper"
)
var MQTTclient MQTT.Client
func init() {
viper.SetDefault("Mqtt.CliendID", "OpenPDU") // max 23 chars
viper.SetDefault("Mqtt.Prefix", "openpdu") // max 23 chars
viper.SetDefault("Mqtt.Schema", "tcp")
viper.SetDefault("Mqtt.Host", "localhost")
viper.SetDefault("Mqtt.Port", "1883")
viper.SetDefault("Mqtt.Username", "")
viper.SetDefault("Mqtt.Password", "")
viper.SetDefault("Mqtt.LWTTopic", "LWT")
viper.SetDefault("Mqtt.LWTMessageOnline", "Online")
viper.SetDefault("Mqtt.LWTMessageOffline", "Offline")
viper.SetDefault("Mqtt.HomeAssistant", false)
config.SetDefault("Mqtt.CliendID", "OpenPDU") // max 23 chars
config.SetDefault("Mqtt.Prefix", "openpdu") // max 23 chars
config.SetDefault("Mqtt.Schema", "tcp")
config.SetDefault("Mqtt.Host", "localhost")
config.SetDefault("Mqtt.Port", "1883")
config.SetDefault("Mqtt.Username", "")
config.SetDefault("Mqtt.Password", "")
config.SetDefault("Mqtt.LWTTopic", "LWT")
config.SetDefault("Mqtt.LWTMessageOnline", "Online")
config.SetDefault("Mqtt.LWTMessageOffline", "Offline")
config.SetDefault("Mqtt.HomeAssistant", false)
// MQTT.ERROR = log.New(os.Stdout, "[ERROR] ", 0)
// MQTT.CRITICAL = log.New(os.Stdout, "[CRIT] ", 0)
@ -34,17 +34,17 @@ func init() {
// https://girishjoshi.io/post/golang-paho-mqtt/
func Setup() {
uri := viper.GetString("Mqtt.Schema") + "://" + viper.GetString("Mqtt.Host") + ":" + viper.GetString("Mqtt.Port")
uri := config.GetString("Mqtt.Schema") + "://" + config.GetString("Mqtt.Host") + ":" + config.GetString("Mqtt.Port")
opts := MQTT.NewClientOptions().AddBroker(uri)
opts.SetClientID(viper.GetString("Mqtt.CliendID"))
opts.SetWill(viper.GetString("Mqtt.Prefix")+"/"+viper.GetString("Mqtt.LWTTopic"), viper.GetString("Mqtt.LWTMessageOffline"), 0, false)
opts.SetClientID(config.GetString("Mqtt.CliendID"))
opts.SetWill(config.GetString("Mqtt.Prefix")+"/"+config.GetString("Mqtt.LWTTopic"), config.GetString("Mqtt.LWTMessageOffline"), 0, false)
if username := viper.GetString("Mqtt.Username"); username != "" {
if username := config.GetString("Mqtt.Username"); username != "" {
opts.SetUsername(username)
}
if password := viper.GetString("Mqtt.Password"); password != "" {
if password := config.GetString("Mqtt.Password"); password != "" {
opts.SetPassword(password)
}
@ -61,7 +61,7 @@ func Setup() {
})
opts.SetOnConnectHandler(func(c MQTT.Client) {
syslog.Notice("mqtt connected")
PublishRoot(viper.GetString("Mqtt.Prefix")+"/"+viper.GetString("Mqtt.LWTTopic"), viper.GetString("Mqtt.LWTMessageOnline"))
PublishRoot(config.GetString("Mqtt.Prefix")+"/"+config.GetString("Mqtt.LWTTopic"), config.GetString("Mqtt.LWTMessageOnline"))
})
MQTTclient = MQTT.NewClient(opts)
@ -79,7 +79,7 @@ func Setup() {
func Subscribe(topic string, handler func(MQTT.Client, MQTT.Message)) {
// MQTTHandler(MQTT.Client, MQTT.Message)
MQTTclient.Subscribe(viper.GetString("Mqtt.Prefix")+"/switch/"+topic, 1, handler)
MQTTclient.Subscribe(config.GetString("Mqtt.Prefix")+"/switch/"+topic, 1, handler)
syslog.Debug(fmt.Sprintf("MQTT subscribed to topic: %s", topic))
}
@ -99,7 +99,7 @@ func Publish(topic string, value string) {
return
}
if MQTTclient.IsConnected() {
MQTTclient.Publish(viper.GetString("Mqtt.Prefix")+"/switch/"+topic, 0, false, value)
MQTTclient.Publish(config.GetString("Mqtt.Prefix")+"/switch/"+topic, 0, false, value)
}
}

37
src/outlets.go
View File

@ -7,6 +7,7 @@ import (
"time"
"git.openpdu.org/OpenPDU/openpdu/board"
"git.openpdu.org/OpenPDU/openpdu/config"
"git.openpdu.org/OpenPDU/openpdu/events"
"git.openpdu.org/OpenPDU/openpdu/mqtt"
"git.openpdu.org/OpenPDU/openpdu/outlet"
@ -59,21 +60,21 @@ func MQTTSetup() {
continue
}
mqtt.Subscribe(topic, c.MQTTHandler)
hAssTopic := "homeassistant/switch/" + viper.GetString("Mqtt.Prefix") + "/" + fmt.Sprint(o) + "/config"
hAssTopic := "homeassistant/switch/" + config.GetString("Mqtt.Prefix") + "/" + fmt.Sprint(o) + "/config"
v := ""
if viper.GetBool("Mqtt.HomeAssistant") {
if config.GetBool("Mqtt.HomeAssistant") {
cfg := map[string]interface{}{
"name": outlet.Outlets[o].Description,
"state_topic": viper.GetString("Mqtt.Prefix") + "/switch/" + c.MQTTStateTopic(),
"command_topic": viper.GetString("Mqtt.Prefix") + "/switch/" + c.MQTTCommandTopic(),
"state_topic": config.GetString("Mqtt.Prefix") + "/switch/" + c.MQTTStateTopic(),
"command_topic": config.GetString("Mqtt.Prefix") + "/switch/" + c.MQTTCommandTopic(),
"payload_off": "off",
"payload_on": "on",
"avty_t": viper.GetString("Mqtt.Prefix") + "/" + viper.GetString("Mqtt.LWTTopic"),
"pl_avail": viper.GetString("Mqtt.LWTMessageOnline"),
"pl_not_avail": viper.GetString("Mqtt.LWTMessageOffline"),
"unique_id": viper.GetString("Mqtt.Prefix") + "_" + fmt.Sprint(o),
"avty_t": config.GetString("Mqtt.Prefix") + "/" + config.GetString("Mqtt.LWTTopic"),
"pl_avail": config.GetString("Mqtt.LWTMessageOnline"),
"pl_not_avail": config.GetString("Mqtt.LWTMessageOffline"),
"unique_id": config.GetString("Mqtt.Prefix") + "_" + fmt.Sprint(o),
"device": map[string]interface{}{
"identifiers": []string{viper.GetString("Mqtt.Prefix")},
"identifiers": []string{config.GetString("Mqtt.Prefix")},
},
}
@ -87,18 +88,18 @@ func MQTTSetup() {
mqtt.PublishRoot(hAssTopic, v)
}
hAssTopic := "homeassistant/switch/" + viper.GetString("Mqtt.Prefix") + "/config"
hAssTopic := "homeassistant/switch/" + config.GetString("Mqtt.Prefix") + "/config"
v := ""
if viper.GetBool("Mqtt.HomeAssistant") {
if config.GetBool("Mqtt.HomeAssistant") {
cfg := map[string]interface{}{
"name": viper.GetString("system.hostname"),
"avty_t": viper.GetString("Mqtt.Prefix") + "/" + viper.GetString("Mqtt.LWTTopic"),
"pl_avail": viper.GetString("Mqtt.LWTMessageOnline"),
"pl_not_avail": viper.GetString("Mqtt.LWTMessageOffline"),
"unique_id": viper.GetString("Mqtt.Prefix"),
"name": config.GetString("system.hostname"),
"avty_t": config.GetString("Mqtt.Prefix") + "/" + config.GetString("Mqtt.LWTTopic"),
"pl_avail": config.GetString("Mqtt.LWTMessageOnline"),
"pl_not_avail": config.GetString("Mqtt.LWTMessageOffline"),
"unique_id": config.GetString("Mqtt.Prefix"),
"device": map[string]interface{}{
"identifiers": []string{viper.GetString("Mqtt.Prefix")},
"name": viper.GetString("system.hostname"),
"identifiers": []string{config.GetString("Mqtt.Prefix")},
"name": config.GetString("system.hostname"),
"model": "OpenPDU",
"sw_version": version,
"manufacturer": "OpenPDU",

14
src/syslog/syslog.go
View File

@ -5,9 +5,9 @@ import (
"log"
"time"
"git.openpdu.org/OpenPDU/openpdu/config"
"git.openpdu.org/OpenPDU/openpdu/events"
"github.com/RackSec/srslog"
"github.com/spf13/viper"
)
var logger *srslog.Writer
@ -22,7 +22,7 @@ var defaults = map[string]interface{}{
func init() {
for k, v := range defaults {
viper.SetDefault(k, v)
config.SetDefault(k, v)
}
Connected = false
events.AddListener("config_changed", Reconfigure)
@ -44,14 +44,15 @@ func Reconfigure() {
func Connect() {
var err error
hostname := viper.GetString("Syslog.Host")
port := viper.GetInt("Syslog.Port")
protocol := viper.GetString("Syslog.Protocol")
format := viper.GetString("Syslog.Format")
hostname := config.GetString("Syslog.Host")
port := config.GetInt("Syslog.Port")
protocol := config.GetString("Syslog.Protocol")
format := config.GetString("Syslog.Format")
conn := fmt.Sprintf("%s:%d", hostname, port)
logger, err = srslog.Dial(protocol, conn, srslog.LOG_WARNING|srslog.LOG_DAEMON, "openpdu")
if err != nil {
Connected = false
Err(fmt.Sprintf("failed to connect to syslog: %s", err.Error()))
time.Sleep(1 * time.Second)
go Connect()
@ -65,6 +66,7 @@ func Connect() {
}
Connected = true
logger.Info("OpenPDU connected to syslog")
}
func Alert(msg string) {

12
src/ups/ups.go
View File

@ -1,10 +1,10 @@
package ups
import (
"git.openpdu.org/OpenPDU/openpdu/config"
"git.openpdu.org/OpenPDU/openpdu/events"
"git.openpdu.org/OpenPDU/openpdu/syslog"
nut "github.com/robbiet480/go.nut"
"github.com/spf13/viper"
)
var upsClient nut.Client
@ -22,7 +22,7 @@ var defaults = map[string]interface{}{
func init() {
for k, v := range defaults {
viper.SetDefault(k, v)
config.SetDefault(k, v)
}
Connected = false
events.AddListener("config_changed", Reconfigure)
@ -33,16 +33,16 @@ func UpsConnect() {
var connectErr, authenticationError error
var u nut.UPS
upsClient, connectErr = nut.Connect(viper.GetString("Ups.Host"), viper.GetInt("Ups.Port"))
upsClient, connectErr = nut.Connect(config.GetString("Ups.Host"), config.GetInt("Ups.Port"))
if connectErr != nil {
syslog.Err(connectErr.Error())
return
}
if username = viper.GetString("Ups.Username"); username == "" {
if username = config.GetString("Ups.Username"); username == "" {
return
}
if password = viper.GetString("Ups.Password"); password == "" {
if password = config.GetString("Ups.Password"); password == "" {
return
}
@ -59,7 +59,7 @@ func UpsConnect() {
}
for _, u = range upsList {
if u.Name == viper.GetString("Ups.Name") {
if u.Name == config.GetString("Ups.Name") {
ups = u
Connected = true
UpsReadVars()

4
src/webui/backup_ui.go
View File

@ -3,7 +3,7 @@ package webui
import (
"path"
"github.com/spf13/viper"
"git.openpdu.org/OpenPDU/openpdu/config"
"gopkg.in/macaron.v1"
)
@ -12,7 +12,7 @@ func backupPage(ctx *macaron.Context) {
}
func backupDownload(ctx *macaron.Context) {
cfgFile := viper.ConfigFileUsed()
cfgFile := config.ConfigFileUsed()
_, fileName := path.Split(cfgFile)
ctx.ServeFile(cfgFile, fileName)
}

48
src/webui/mqtt_ui.go
View File

@ -3,8 +3,8 @@ package webui
import (
"strings"
"git.openpdu.org/OpenPDU/openpdu/config"
"git.openpdu.org/OpenPDU/openpdu/mqtt"
"github.com/spf13/viper"
"gopkg.in/macaron.v1"
)
@ -17,17 +17,17 @@ func SetMQTTReconfigFunction(f MQTTReconfigFunction) {
}
func mqttPage(ctx *macaron.Context) {
ctx.Data["schema"] = viper.GetString("Mqtt.Schema")
ctx.Data["host"] = viper.GetString("Mqtt.Host")
ctx.Data["port"] = viper.GetString("Mqtt.Port")
ctx.Data["clientid"] = viper.GetString("Mqtt.CliendID")
ctx.Data["prefix"] = viper.GetString("Mqtt.Prefix")
ctx.Data["username"] = viper.GetString("Mqtt.Username")
ctx.Data["password"] = viper.GetString("Mqtt.Password")
ctx.Data["lwttopic"] = viper.GetString("Mqtt.LWTTopic")
ctx.Data["lwtonline"] = viper.GetString("Mqtt.LWTMessageOnline")
ctx.Data["lwtoffline"] = viper.GetString("Mqtt.LWTMessageOffline")
ctx.Data["homeassistant"] = viper.GetString("Mqtt.homeassistant")
ctx.Data["schema"] = config.GetString("Mqtt.Schema")
ctx.Data["host"] = config.GetString("Mqtt.Host")
ctx.Data["port"] = config.GetString("Mqtt.Port")
ctx.Data["clientid"] = config.GetString("Mqtt.CliendID")
ctx.Data["prefix"] = config.GetString("Mqtt.Prefix")
ctx.Data["username"] = config.GetString("Mqtt.Username")
ctx.Data["password"] = config.GetString("Mqtt.Password")
ctx.Data["lwttopic"] = config.GetString("Mqtt.LWTTopic")
ctx.Data["lwtonline"] = config.GetString("Mqtt.LWTMessageOnline")
ctx.Data["lwtoffline"] = config.GetString("Mqtt.LWTMessageOffline")
ctx.Data["homeassistant"] = config.GetString("Mqtt.homeassistant")
if mqtt.Connected() {
ctx.Data["mqttstatus"] = "Connected"
@ -60,24 +60,24 @@ func mqttPost(ctx *macaron.Context, f MQTTPostForm) {
"tcp",
"ssl",
"ws":
viper.Set("Mqtt.Schema", schema)
config.Set("Mqtt.Schema", schema)
default:
mqttPage(ctx)
return
}
viper.Set("Mqtt.Host", strings.ToLower(strings.TrimSpace(f.Host)))
viper.Set("Mqtt.Port", strings.ToLower(strings.TrimSpace(f.Port)))
viper.Set("Mqtt.CliendID", strings.TrimSpace(f.ClientID))
viper.Set("Mqtt.Prefix", strings.TrimSpace(f.Prefix))
viper.Set("Mqtt.Username", strings.TrimSpace(f.Username))
viper.Set("Mqtt.Password", f.Password)
viper.Set("Mqtt.LWTTopic", strings.TrimSpace(f.LWTTopic))
viper.Set("Mqtt.LWTMessageOnline", strings.TrimSpace(f.LWTMessageOnline))
viper.Set("Mqtt.LWTMessageOffline", strings.TrimSpace(f.LWTMessageOffline))
viper.Set("Mqtt.HomeAssistant", f.HomeAssistant)
config.Set("Mqtt.Host", strings.ToLower(strings.TrimSpace(f.Host)))
config.Set("Mqtt.Port", strings.ToLower(strings.TrimSpace(f.Port)))
config.Set("Mqtt.CliendID", strings.TrimSpace(f.ClientID))
config.Set("Mqtt.Prefix", strings.TrimSpace(f.Prefix))
config.Set("Mqtt.Username", strings.TrimSpace(f.Username))
config.Set("Mqtt.Password", f.Password)
config.Set("Mqtt.LWTTopic", strings.TrimSpace(f.LWTTopic))
config.Set("Mqtt.LWTMessageOnline", strings.TrimSpace(f.LWTMessageOnline))
config.Set("Mqtt.LWTMessageOffline", strings.TrimSpace(f.LWTMessageOffline))
config.Set("Mqtt.HomeAssistant", f.HomeAssistant)
viper.WriteConfig()
config.WriteConfig()
if mqttReconfigFunction != nil {
go mqttReconfigFunction()

6
src/webui/outlets_ui.go
View File

@ -6,9 +6,9 @@ import (
"strconv"
"strings"
"git.openpdu.org/OpenPDU/openpdu/config"
"git.openpdu.org/OpenPDU/openpdu/events"
"git.openpdu.org/OpenPDU/openpdu/outlet"
"github.com/spf13/viper"
"gopkg.in/macaron.v1"
)
@ -75,7 +75,7 @@ func outletEditPost(ctx *macaron.Context, f OutletPostForm) {
outlet.Outlets[num].Description = strings.TrimSpace(f.Description)
s2 := fmt.Sprintf("outlets.%s.description", outlet.Outlets[num].ID)
viper.Set(s2, outlet.Outlets[num].Description)
config.Set(s2, outlet.Outlets[num].Description)
mqttstate := strings.TrimSpace(f.MQTTStateTopic)
if mqttstate == "" {
@ -89,7 +89,7 @@ func outletEditPost(ctx *macaron.Context, f OutletPostForm) {
}
outlet.Outlets[num].Channel.SetMQTTCommandTopic(mqttcommand)
viper.WriteConfig()
config.WriteConfig()
events.FireEvent("outlet_config_changed")

20
src/webui/syslog_ui.go
View File

@ -3,16 +3,16 @@ package webui
import (
"strings"
"git.openpdu.org/OpenPDU/openpdu/config"
"git.openpdu.org/OpenPDU/openpdu/syslog"
"github.com/spf13/viper"
"gopkg.in/macaron.v1"
)
func syslogPage(ctx *macaron.Context) {
ctx.Data["host"] = viper.GetString("Syslog.Host")
ctx.Data["port"] = viper.GetInt("Syslog.Port")
ctx.Data["protocol"] = viper.GetString("Syslog.Protocol")
ctx.Data["format"] = viper.GetString("Syslog.Format")
ctx.Data["host"] = config.GetString("Syslog.Host")
ctx.Data["port"] = config.GetInt("Syslog.Port")
ctx.Data["protocol"] = config.GetString("Syslog.Protocol")
ctx.Data["format"] = config.GetString("Syslog.Format")
if syslog.Connected {
ctx.Data["status"] = "Connected"
@ -32,12 +32,12 @@ type SyslogPostForm struct {
func syslogPost(ctx *macaron.Context, f SyslogPostForm) {
// TODO: check protocol, it should be 'udp' or 'tcp'
viper.Set("Syslog.Host", strings.ToLower(strings.TrimSpace(f.Host)))
viper.Set("Syslog.Port", f.Port)
viper.Set("Syslog.Protocol", strings.TrimSpace(f.Protocol))
config.Set("Syslog.Host", strings.ToLower(strings.TrimSpace(f.Host)))
config.Set("Syslog.Port", f.Port)
config.Set("Syslog.Protocol", strings.TrimSpace(f.Protocol))
// TODO: check format, it should be 'RFC5424' or 'RFC3164'
viper.Set("Syslog.Format", strings.TrimSpace(f.Format))
viper.WriteConfig()
config.Set("Syslog.Format", strings.TrimSpace(f.Format))
config.WriteConfig()
syslogPage(ctx)
}

24
src/webui/ups_ui.go
View File

@ -3,17 +3,17 @@ package webui
import (
"strings"
"git.openpdu.org/OpenPDU/openpdu/config"
"git.openpdu.org/OpenPDU/openpdu/ups"
"github.com/spf13/viper"
"gopkg.in/macaron.v1"
)
func upsPage(ctx *macaron.Context) {
ctx.Data["host"] = viper.GetString("Ups.Host")
ctx.Data["port"] = viper.GetInt("Ups.Port")
ctx.Data["upsname"] = viper.GetString("Ups.Name")
ctx.Data["username"] = viper.GetString("Ups.Username")
ctx.Data["password"] = viper.GetString("Ups.Password")
ctx.Data["host"] = config.GetString("Ups.Host")
ctx.Data["port"] = config.GetInt("Ups.Port")
ctx.Data["upsname"] = config.GetString("Ups.Name")
ctx.Data["username"] = config.GetString("Ups.Username")
ctx.Data["password"] = config.GetString("Ups.Password")
if ups.Connected {
ctx.Data["serverstatus"] = "Connected"
@ -40,12 +40,12 @@ type UPSPostForm struct {
}
func upsPost(ctx *macaron.Context, f UPSPostForm) {
viper.Set("Ups.Host", strings.ToLower(strings.TrimSpace(f.Host)))
viper.Set("Ups.Port", f.Port)
viper.Set("Ups.Name", strings.TrimSpace(f.UpsName))
viper.Set("Ups.Username", strings.TrimSpace(f.Username))
viper.Set("Ups.Password", f.Password)
viper.WriteConfig()
config.Set("Ups.Host", strings.ToLower(strings.TrimSpace(f.Host)))
config.Set("Ups.Port", f.Port)
config.Set("Ups.Name", strings.TrimSpace(f.UpsName))
config.Set("Ups.Username", strings.TrimSpace(f.Username))
config.Set("Ups.Password", f.Password)
config.WriteConfig()
upsPage(ctx)
}

6
src/webui/webui.go
View File

@ -3,10 +3,10 @@ package webui
import (
"net/http"
"git.openpdu.org/OpenPDU/openpdu/config"
"git.openpdu.org/OpenPDU/openpdu/syslog"
"github.com/go-macaron/binding"
"github.com/go-macaron/pongo2"
"github.com/spf13/viper"
"gopkg.in/macaron.v1"
)
@ -14,7 +14,7 @@ import (
type Dictionary map[string]interface{}
func init() {
viper.SetDefault("system.listeningport", 4000)
config.SetDefault("system.listeningport", 4000)
}
func StartServer() {
@ -39,5 +39,5 @@ func StartServer() {
m.Post("/json/outlet/:id/toggle", jsonOutletToggle)
syslog.Info("Web interface ready")
http.ListenAndServe("0.0.0.0:"+viper.GetString("system.listeningport"), m)
http.ListenAndServe("0.0.0.0:"+config.GetString("system.listeningport"), m)
}