This commit is contained in:
@@ -82,8 +82,7 @@ jobs:
|
|||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
push: true
|
push: true
|
||||||
tags: ham/hamview-receiver:latest
|
tags: ${{ vars.REGISTRY }}/ham/hamview-receiver:latest
|
||||||
registry: ${{ vars.REGISTRY }}
|
|
||||||
context: .
|
context: .
|
||||||
platforms: |
|
platforms: |
|
||||||
linux/amd64
|
linux/amd64
|
||||||
|
|||||||
@@ -50,14 +50,14 @@ func runAPRSIS(ctx context.Context, command *cli.Command) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func receiveAPRSIS(config *hamview.BrokerConfig, callsign string, client *aprsis.ProxyClient) {
|
func receiveAPRSIS(config *hamview.BrokerConfig, callsign string, client *aprsis.ProxyClient) {
|
||||||
defer client.Close()
|
defer func() { _ = client.Close() }()
|
||||||
|
|
||||||
broker, err := hamview.NewBroker(config)
|
broker, err := hamview.NewBroker(config)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Errorf("receiver: can't setup to broker: %v", err)
|
logger.Errorf("receiver: can't setup to broker: %v", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer broker.Close()
|
defer func() { _ = broker.Close() }()
|
||||||
|
|
||||||
info := client.Info() // TODO: enrich info from config?
|
info := client.Info() // TODO: enrich info from config?
|
||||||
|
|
||||||
@@ -73,5 +73,5 @@ func receiveAPRSIS(config *hamview.BrokerConfig, callsign string, client *aprsis
|
|||||||
logger.Error(err)
|
logger.Error(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
logger.Info("receiver: stopped receiving packets from station: %s", callsign)
|
logger.Infof("receiver: stopped receiving packets from station: %s", callsign)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,13 +34,13 @@ func runMeshCore(ctx context.Context, command *cli.Command) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer broker.Close()
|
defer func() { _ = broker.Close() }()
|
||||||
|
|
||||||
receiver, err := hamview.NewMeshCoreReceiver(&config.Receiver)
|
receiver, err := hamview.NewMeshCoreReceiver(&config.Receiver)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
defer receiver.Close()
|
defer func() { _ = receiver.Close() }()
|
||||||
|
|
||||||
info := receiver.Info() // TODO: enrich info from config?
|
info := receiver.Info() // TODO: enrich info from config?
|
||||||
if err = broker.StartRadio(protocol.MeshCore, info); err != nil {
|
if err = broker.StartRadio(protocol.MeshCore, info); err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user