didinst/ycli-mon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add hostname as tag

Browse Source
This commit is contained in:
didinst
2023-10-15 02:53:06 +03:00
parent 234a50adb2
commit 89bf574dec
9 changed files with 68 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yabl/init.go
+26 -26
View File
@@ -1,7 +1,7 @@
package yabl
func (c *converter) initialize() {
c.protocolMap = make(map[key]action)
c.protocolMap = make(map[key]*action)
for i := uint(1); i <= CONNECTOR_COUNT; i++ {
key := key{CanIdCpuPresentEnergy, i}
@@ -12,7 +12,7 @@ func (c *converter) initialize() {
{length: 10, setter: cpe.setPresentCurrent, name: FPresentCurrent},
{length: 11, setter: cpe.setPresentVoltage, name: FPresentVoltage},
}
c.protocolMap[key] = action{fields: fields, interval: 50, name: PCpuPresentEnergy, object: cpe}
c.protocolMap[key] = &action{fields: fields, interval: 50, name: PCpuPresentEnergy, object: cpe}
}
c.cpuPeripheryInstance = &CpuPeriphery{unit: 0}
@@ -21,7 +21,7 @@ func (c *converter) initialize() {
{length: 2, setter: c.cpuPeripheryInstance.setCircuitBreakerInput, name: FCircuitBreakerInput},
{length: 2, setter: c.cpuPeripheryInstance.setCircuitBreakerPowerCBInput, name: FCircuitBreakerPowerCBInput},
}
c.protocolMap[key{CanIdCpuPeriphery, 0}] = action{
c.protocolMap[key{CanIdCpuPeriphery, 0}] = &action{
fields: fields,
interval: 1000,
name: PCpuPeriphery,
@@ -39,7 +39,7 @@ func (c *converter) initialize() {
{length: 11, setter: ces.setTargetBatteryVoltage, name: FTargetBatteryVoltage},
{length: 11, setter: ces.setTargetGoalVoltage, name: FTargetGoalVoltage},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PCpuEnergySettings, object: ces}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PCpuEnergySettings, object: ces}
}
c.cpuErrorsInstance = &CpuErrors{unit: 0}
@@ -63,7 +63,7 @@ func (c *converter) initialize() {
{length: 2, setter: c.cpuErrorsInstance.setContactorInputError, name: FContactorInputError},
{length: 2, setter: c.cpuErrorsInstance.setNotReadyPeriphery, name: FNotReadyPeriphery},
}
c.protocolMap[key{CanIdCpuErrors, 0}] = action{
c.protocolMap[key{CanIdCpuErrors, 0}] = &action{
fields: fields,
interval: 1000,
name: PCpuErrors,
@@ -77,7 +77,7 @@ func (c *converter) initialize() {
{length: 3, setter: c.cpuDebugInstance.setDebugCircuitBreakerOn, name: FDebugCircuitBreakerOn},
{length: 3, setter: c.cpuDebugInstance.setDebugRedButtonSoftware, name: FDebugRedButtonSoftware},
}
c.protocolMap[key{CanIdCpuDebug, 0}] = action{
c.protocolMap[key{CanIdCpuDebug, 0}] = &action{
fields: fields,
interval: 1000,
name: PCpuDebug,
@@ -94,7 +94,7 @@ func (c *converter) initialize() {
{length: 11, setter: ppe.setVoltageAfter, name: FVoltageAfter},
{length: 10, setter: ppe.setPresentCurrent, name: FPresentCurrent},
}
c.protocolMap[key] = action{fields: fields, interval: 50, name: PPuPresentEnergy, object: ppe}
c.protocolMap[key] = &action{fields: fields, interval: 50, name: PPuPresentEnergy, object: ppe}
}
for i := uint(1); i <= CONNECTOR_COUNT; i++ {
@@ -111,7 +111,7 @@ func (c *converter) initialize() {
{length: 2, setter: pp.setPwmEnabled, name: FPwmEnabled},
{length: 9, setter: pp.setCpLineVoltage, name: FCpLineVoltage},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PPuPeriphery, object: pp}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PPuPeriphery, object: pp}
}
for i := uint(1); i <= CONNECTOR_COUNT; i++ {
@@ -136,7 +136,7 @@ func (c *converter) initialize() {
{length: 2, setter: pe.setOutputCircuitBreakerEnabled, name: FOutputCircuitBreakerEnabled},
{length: 12, setter: pe.setOutputCircuitBreakerEnabledValue, name: FOutputCircuitBreakerEnabledValue},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PPuErrors, object: pe}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PPuErrors, object: pe}
}
for i := uint(0); i <= CONNECTOR_COUNT; i++ {
@@ -147,7 +147,7 @@ func (c *converter) initialize() {
{length: 2, setter: pd.setDebugModeOn, name: FDebugModeOn},
{length: 3, setter: pd.setDebugContactorOutputOn, name: FDebugContactorOutputOn},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PPuDebug, object: pd}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PPuDebug, object: pd}
}
for i := uint(1); i <= CONNECTOR_COUNT; i++ {
@@ -160,7 +160,7 @@ func (c *converter) initialize() {
{length: 11, setter: ste.setTargetGoalVoltage, name: FTargetGoalVoltage},
{length: 10, setter: ste.setTargetCurrent, name: FTargetCurrent},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PSeccTargetEnergy, object: ste}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PSeccTargetEnergy, object: ste}
}
for i := uint(1); i <= CONNECTOR_COUNT; i++ {
@@ -171,7 +171,7 @@ func (c *converter) initialize() {
{length: 3, setter: se.setBoardReady, name: FBoardReady},
{length: 2, setter: se.setNotReadyLogic, name: FNotReadyLogic},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PSeccErrors, object: se}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PSeccErrors, object: se}
}
for i := uint(0); i <= CONNECTOR_COUNT; i++ {
@@ -182,7 +182,7 @@ func (c *converter) initialize() {
{length: 2, setter: la.setAuthMode, name: FAuthMode},
{length: 3, setter: la.setAuthState, name: FAuthState},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PLogicAuth, object: la}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PLogicAuth, object: la}
}
for i := uint(0); i <= CONNECTOR_COUNT; i++ {
@@ -195,7 +195,7 @@ func (c *converter) initialize() {
{length: 11, setter: lem.setVoltageMax, name: FVoltageMax},
{length: 14, setter: lem.setPowerMax, name: FPowerMax},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PLogicEnergyMode, object: lem}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PLogicEnergyMode, object: lem}
}
c.logicErrorsInstance = &LogicErrors{unit: 0}
@@ -203,7 +203,7 @@ func (c *converter) initialize() {
{length: 3, setter: c.logicErrorsInstance.setBoardReady, name: FBoardReady},
{length: 2, setter: c.logicErrorsInstance.setNotReadySettings, name: FNotReadySettings},
}
c.protocolMap[key{CanIdLogicErrors, 0}] = action{
c.protocolMap[key{CanIdLogicErrors, 0}] = &action{
fields: fields,
interval: 1000,
name: PLogicErrors,
@@ -218,7 +218,7 @@ func (c *converter) initialize() {
{length: 5, setter: lwm.setTargetContactorMode, name: FTargetContactorMode},
{length: 2, setter: lwm.setAvailability, name: FAvailability},
}
c.protocolMap[key] = action{
c.protocolMap[key] = &action{
fields: fields,
interval: 1000,
name: PLogicWorkingMode,
@@ -237,7 +237,7 @@ func (c *converter) initialize() {
{length: 2, setter: cis.setIsolated, name: FIsolated},
{length: 2, setter: cis.setDebugEnabled, name: FDebugEnabled},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PContactorInternalState, object: cis}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PContactorInternalState, object: cis}
}
c.contactorInternalErrorsInstance = &ContactorInternalErrors{unit: 0}
@@ -251,7 +251,7 @@ func (c *converter) initialize() {
{length: 2, setter: c.contactorInternalErrorsInstance.setDebug, name: FDebug},
{length: 5, setter: c.contactorInternalErrorsInstance.setPresentContactorMode, name: FPresentContactorMode},
}
c.protocolMap[key{CanIdContIntErr, 0}] = action{
c.protocolMap[key{CanIdContIntErr, 0}] = &action{
fields: fields,
interval: 1000,
name: PContactorInternalErrors,
@@ -263,7 +263,7 @@ func (c *converter) initialize() {
{length: 2, setter: c.contactorsInternalForce.setForceModeEnabled, name: FForceModeEnabled},
{length: 4, setter: c.contactorsInternalForce.setForceModeValue, name: FForceModeValue},
}
c.protocolMap[key{CanIdContIntForce, 0}] = action{
c.protocolMap[key{CanIdContIntForce, 0}] = &action{
fields: fields,
interval: 1000,
name: PContactorsInternalForce,
@@ -278,7 +278,7 @@ func (c *converter) initialize() {
{length: 2, setter: cid.setDebugModeOn, name: FDebugModeOn},
{length: 3, setter: cid.setDebugContactorOn, name: FDebugContactorOn},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PContactorInternalDebug, object: cid}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PContactorInternalDebug, object: cid}
}
for i := uint(0); i <= CONNECTOR_COUNT; i++ {
@@ -309,7 +309,7 @@ func (c *converter) initialize() {
{length: 2, setter: ps.setErrorContactorsInternalCircuitBreaker, name: FErrorContactorsInternalCircuitBreaker},
{length: 2, setter: ps.setErrorPlcCircuitBreaker, name: FErrorPlcCircuitBreaker},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PPeripheryState, object: ps}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PPeripheryState, object: ps}
}
for i := uint(0); i <= CONNECTOR_COUNT; i++ {
@@ -323,7 +323,7 @@ func (c *converter) initialize() {
{length: 2, setter: pi.setStateShsnFan, name: FStateShsnFan},
{length: 2, setter: pi.setStateShptFan, name: FStateShptFan},
}
c.protocolMap[key] = action{fields: fields, interval: 5000, name: PPeripheryInfo, object: pi}
c.protocolMap[key] = &action{fields: fields, interval: 5000, name: PPeripheryInfo, object: pi}
}
for i := uint(0); i <= CONNECTOR_COUNT; i++ {
@@ -336,7 +336,7 @@ func (c *converter) initialize() {
{length: 3, setter: pd.setDebugShptFan, name: FDebugShptFan},
{length: 3, setter: pd.setDebugIoBoardTestLamp, name: FDebugIoBoardTestLamp},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PPeripheryDebug, object: pd}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PPeripheryDebug, object: pd}
}
for i := uint(1); i < CONVERTERS_MAX; i++ {
@@ -349,7 +349,7 @@ func (c *converter) initialize() {
{length: 10, setter: cpe.setPresentCurrent, name: FPresentCurrent},
{length: 8, setter: cpe.setConnectedOut, name: FConnectedOut},
}
c.protocolMap[key] = action{fields: fields, interval: 500, name: PConverterPresentEnergy, object: cpe}
c.protocolMap[key] = &action{fields: fields, interval: 500, name: PConverterPresentEnergy, object: cpe}
}
for i := uint(1); i < CONVERTERS_MAX; i++ {
@@ -375,7 +375,7 @@ func (c *converter) initialize() {
{length: 2, setter: ce.setDebugConvEnabled, name: FDebugConvEnabled},
{length: 2, setter: ce.setDebugConvDisabled, name: FDebugConvDisabled},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PConverterErrors, object: ce}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PConverterErrors, object: ce}
}
for i := uint(0); i < CONVERTERS_MAX; i++ {
@@ -388,7 +388,7 @@ func (c *converter) initialize() {
{length: 11, setter: cd.setDebugTargetVoltage, name: FDebugTargetVoltage},
{length: 10, setter: cd.setDebugTargetCurrent, name: FDebugTargetCurrent},
}
c.protocolMap[key] = action{fields: fields, interval: 1000, name: PConverterDebug, object: cd}
c.protocolMap[key] = &action{fields: fields, interval: 1000, name: PConverterDebug, object: cd}
}
// set "null" values
yabl/protocol.go
+21 -10
View File
@@ -3,6 +3,7 @@ package yabl
import (
can "cli-mon/can"
"encoding/binary"
"os"
time "time"
)
@@ -27,7 +28,8 @@ type key struct {
}
type converter struct {
protocolMap map[key]action
tag string
protocolMap map[key]*action
cpuPresentEnergyArray [CONNECTOR_MAX]*CpuPresentEnergy
cpuPeripheryInstance *CpuPeriphery
cpuEnergySettingsArray [CONNECTOR_MAX]*CpuEnergySettings
@@ -60,8 +62,15 @@ type Converter interface {
CheckTimeouts(isOffline bool) ([]*Event, bool)
}
func NewProtocolConverter() Converter {
c := &converter{}
func NewProtocolConverter(tag string) Converter {
if len(tag) == 0 {
tag = os.Getenv("HOSTNAME")
if len(tag) == 0 {
tag, _ = os.Hostname()
}
}
c := &converter{tag: tag}
c.initialize()
return c
}
@@ -86,9 +95,10 @@ func (c *converter) EventsFromFrame(frame *can.CanFrame) ([]*Event, bool) {
obj := f.setter(val)
event := &Event{
Field: f.name,
ActionName: param.name,
Object: param.object,
Tag: &c.tag,
Field: &f.name,
ActionName: &param.name,
Object: &param.object,
unit: unit(unitId),
Updated: frame.Date,
Value: obj,
@@ -148,9 +158,10 @@ func (c *converter) CheckTimeouts(isOffline bool) ([]*Event, bool) {
}
event := &Event{
Field: fld.name,
ActionName: param.name,
Object: param.object,
Tag: &c.tag,
Field: &fld.name,
ActionName: &param.name,
Object: &param.object,
unit: unit(k.unitId),
Updated: &deadline,
Value: nil,
@@ -169,7 +180,7 @@ func (c *converter) CheckTimeouts(isOffline bool) ([]*Event, bool) {
return events, events != nil
}
func getMaxTime(protocolMap *map[key]action) time.Time {
func getMaxTime(protocolMap *map[key]*action) time.Time {
now := time.Unix(0, 0)
for _, param := range *protocolMap {
yabl/strings.go
+4 -2
View File
@@ -218,12 +218,14 @@ func (c ConnectedOut8bitType) String() string {
func (u *Event) MarshalJSON() ([]byte, error) {
return json.Marshal(struct {
Host *string
Unit uint
ActionName AName
Field FName
ActionName *AName
Field *FName
Updated *time.Time
Value string
}{
Host: u.Tag,
Unit: u.GetUnitId(),
ActionName: u.ActionName,
Field: u.Field,
yabl/types.go
+4 -3
View File
@@ -13,9 +13,10 @@ type Action interface {
type Event struct {
unit
ActionName AName
Field FName
Object Action
Tag *string
ActionName *AName
Field *FName
Object *Action //TODO Actually obj, or copy on event generation time?
Updated *time.Time
Value any
}