Skip to content

Commit 87fcd15

Browse files
xBlaz3kxxBlaz3kx
committed
fix: compilation issues
1 parent 297aab1 commit 87fcd15

File tree

114 files changed

+5289
-571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+5289
-571
lines changed

‎.golangci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ linters:
2424
generated: lax
2525
paths:
2626
- ./gen/*
27-
- ./pkg/reader
27+
- ./pkg/hardware/reader
2828
formatters:
2929
settings:
3030
goimports:

‎cmd/charge_point.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ package cmd
33
import (
44
"context"
55

6+
"go.uber.org/zap"
7+
8+
"github.com/lorenzodonini/ocpp-go/ocpp1.6/core"
9+
"github.com/lorenzodonini/ocpp-go/ocpp1.6/localauth"
10+
"github.com/lorenzodonini/ocpp-go/ocpp1.6/remotetrigger"
11+
"github.com/lorenzodonini/ocpp-go/ocpp1.6/reservation"
12+
"github.com/pkg/errors"
13+
614
"github.com/ChargePi/ChargePi-go/internal/auth"
715
"github.com/ChargePi/ChargePi-go/internal/chargepoint"
816
v16 "github.com/ChargePi/ChargePi-go/internal/chargepoint/v16"
@@ -12,12 +20,6 @@ import (
1220
"github.com/ChargePi/ChargePi-go/internal/sessions"
1321
"github.com/ChargePi/ChargePi-go/pkg/hardware/indicator"
1422
"github.com/ChargePi/ChargePi-go/pkg/ocpp"
15-
"github.com/lorenzodonini/ocpp-go/ocpp1.6/core"
16-
"github.com/lorenzodonini/ocpp-go/ocpp1.6/localauth"
17-
"github.com/lorenzodonini/ocpp-go/ocpp1.6/remotetrigger"
18-
"github.com/lorenzodonini/ocpp-go/ocpp1.6/reservation"
19-
"github.com/pkg/errors"
20-
log "github.com/sirupsen/logrus"
2123
)
2224

2325
var supportedOcppV16Profiles = []string{
@@ -31,7 +33,7 @@ var supportedOcppV16Profiles = []string{
3133
func NewChargePoint(
3234
ctx context.Context,
3335
protocolVersion ocpp.ProtocolVersion,
34-
logger log.FieldLogger,
36+
logger *zap.Logger,
3537
manager manager.Manager,
3638
tagManager auth.Service,
3739
settingsManager settings.Manager,
@@ -54,7 +56,7 @@ func NewChargePoint(
5456
switch protocolVersion {
5557
case ocpp.OCPP16:
5658
// Setup OCPP configuration from the database
57-
return v16.NewChargePoint(manager, settingsManager, tagManager, sessionManager, diagnosticsManager, opts...)
59+
return v16.NewChargePoint(logger, manager, settingsManager, tagManager, sessionManager, diagnosticsManager, opts...)
5860
case ocpp.OCPP201:
5961
return nil, errors.New("Version 2.0.1 is not supported yet.")
6062
default:

‎cmd/export.go‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ package cmd
33
import (
44
"fmt"
55

6+
"go.uber.org/zap"
7+
8+
"github.com/ChargePi/ocpp-manager/ocpp_v16"
9+
"github.com/spf13/cobra"
10+
611
"github.com/ChargePi/ChargePi-go/internal/auth"
712
"github.com/ChargePi/ChargePi-go/internal/chargepoint"
813
"github.com/ChargePi/ChargePi-go/internal/pkg/badger"
914
cfg "github.com/ChargePi/ChargePi-go/internal/pkg/configuration"
1015
exporter2 "github.com/ChargePi/ChargePi-go/internal/pkg/configuration/exporter"
1116
"github.com/ChargePi/ChargePi-go/internal/pkg/configuration/manager"
12-
"github.com/ChargePi/ocpp-manager/ocpp_v16"
13-
"github.com/spf13/cobra"
1417
)
1518

1619
var (
@@ -34,7 +37,8 @@ func exportCommand() *cobra.Command {
3437
return fmt.Errorf("could not create database: %v", err)
3538
}
3639

37-
tagManager := auth.NewManager(db, db)
40+
logger := zap.L()
41+
tagManager := auth.NewManager(logger, db, db)
3842

3943
configurationManager, err := ocpp_v16.NewV16ConfigurationManager(ocpp_v16.NewEmptyConfiguration())
4044
if err != nil {

‎cmd/import.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ package cmd
33
import (
44
"fmt"
55

6+
"github.com/ChargePi/ocpp-manager/ocpp_v16"
7+
"github.com/spf13/cobra"
8+
69
"github.com/ChargePi/ChargePi-go/internal/chargepoint"
710
"github.com/ChargePi/ChargePi-go/internal/pkg/badger"
811
cfg "github.com/ChargePi/ChargePi-go/internal/pkg/configuration"
912
importer2 "github.com/ChargePi/ChargePi-go/internal/pkg/configuration/importer"
1013
"github.com/ChargePi/ChargePi-go/internal/pkg/configuration/manager"
1114
"github.com/ChargePi/ChargePi-go/pkg/ocpp"
12-
"github.com/ChargePi/ocpp-manager/ocpp_v16"
13-
"github.com/spf13/cobra"
1415
)
1516

1617
var (

‎cmd/root.go‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@ package cmd
22

33
import (
44
"context"
5-
"github.com/ChargePi/ChargePi-go/internal/pkg/configuration"
6-
"github.com/ChargePi/ChargePi-go/pkg/observability"
7-
"github.com/spf13/cobra"
8-
"github.com/spf13/viper"
9-
"go.uber.org/zap"
105
"os"
116
"os/signal"
127
"syscall"
8+
9+
"github.com/spf13/cobra"
10+
"github.com/spf13/viper"
11+
"go.uber.org/zap"
12+
13+
"github.com/ChargePi/ChargePi-go/internal/pkg/configuration"
14+
"github.com/ChargePi/ChargePi-go/pkg/observability"
1315
)
1416

1517
var rootCmd = &cobra.Command{
@@ -21,7 +23,7 @@ var rootCmd = &cobra.Command{
2123

2224
func init() {
2325
cobra.OnInitialize(func() {
24-
// observability.SetupLogging(log.StandardLogger(), observability.Logging{}, viper.GetBool(configuration.Debug))
26+
observability.SetupLogger(viper.GetBool(configuration.Debug))
2527
})
2628

2729
rootCmd.AddCommand(runCommand())

‎cmd/run.go‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ package cmd
22

33
import (
44
"context"
5+
6+
"github.com/ChargePi/ocpp-manager/ocpp_v16"
7+
"github.com/lorenzodonini/ocpp-go/ocpp1.6/core"
8+
"github.com/spf13/cobra"
9+
"github.com/spf13/viper"
10+
"go.uber.org/zap"
11+
512
"github.com/ChargePi/ChargePi-go/internal/api/grpc"
613
"github.com/ChargePi/ChargePi-go/internal/api/http"
714
"github.com/ChargePi/ChargePi-go/internal/auth"
@@ -15,11 +22,6 @@ import (
1522
"github.com/ChargePi/ChargePi-go/internal/sessions"
1623
"github.com/ChargePi/ChargePi-go/internal/users"
1724
"github.com/ChargePi/ChargePi-go/pkg/observability"
18-
"github.com/ChargePi/ocpp-manager/ocpp_v16"
19-
"github.com/lorenzodonini/ocpp-go/ocpp1.6/core"
20-
log "github.com/sirupsen/logrus"
21-
"github.com/spf13/cobra"
22-
"github.com/spf13/viper"
2325
)
2426

2527
var (
@@ -42,19 +44,18 @@ func runCommand() *cobra.Command {
4244
ctx := cmd.Context()
4345

4446
// Create a logger
45-
logger := log.StandardLogger()
46-
observability.SetupLogging(logger, runtimeSettings.Logging, debug)
47+
logger := observability.SetupLogger(debug)
4748

4849
// Create a database for EVSE settings and state, tags, users, sessions and settings
4950
db, err := badger.NewBadgerDb(*databasePath)
5051
if err != nil {
51-
logger.WithError(err).Fatal("Cannot create database")
52+
logger.With(zap.Error(err)).Fatal("Cannot create database")
5253
}
5354

5455
// Get the persistent settings
5556
persistentSettings, err := db.GetSettings()
5657
if err != nil {
57-
logger.WithError(err).Fatal("Cannot read persistent settings")
58+
logger.With(zap.Error(err)).Fatal("Cannot read persistent settings")
5859
}
5960

6061
var (
@@ -67,56 +68,56 @@ func runCommand() *cobra.Command {
6768

6869
cfg, err := ocpp_v16.DefaultConfigurationFromProfiles(supportedOcppV16Profiles...)
6970
if err != nil {
70-
logger.WithError(err).Fatal("Cannot create OCPP configuration")
71+
logger.With(zap.Error(err)).Fatal("Cannot create OCPP configuration")
7172
}
7273

7374
ocppVariableManager, err := ocpp_v16.NewV16ConfigurationManager(*cfg, supportedOcppV16Profiles...)
7475
if err != nil {
75-
logger.WithError(err).Fatal("Cannot create OCPP variable manager")
76+
logger.With(zap.Error(err)).Fatal("Cannot create OCPP variable manager")
7677
}
7778

7879
settingsManager, err := configManager.NewManager(db, db, ocppVariableManager)
7980
if err != nil {
80-
logger.WithError(err).Fatal("Cannot create settings manager")
81+
logger.With(zap.Error(err)).Fatal("Cannot create settings manager")
8182
}
8283

8384
evseManager, err := manager.NewManager(db, db, make(chan notifications.StatusNotification, 100))
8485
if err != nil {
85-
logger.WithError(err).Fatal("Cannot create EVSE manager")
86+
logger.With(zap.Error(err)).Fatal("Cannot create EVSE manager")
8687
}
8788

8889
diagnosticsManager, err := diagnostics.NewService()
8990
if err != nil {
90-
logger.WithError(err).Fatal("Cannot create diagnostics service")
91+
logger.With(zap.Error(err)).Fatal("Cannot create diagnostics service")
9192
}
9293

93-
tagManager := auth.NewManager(db, db)
94-
sessionManager, err := sessions.NewSessionService(db)
94+
tagManager := auth.NewManager(logger, db, db)
95+
sessionManager, err := sessions.NewSessionService(logger, db)
9596
if err != nil {
96-
logger.WithError(err).Fatal("Cannot create session service")
97+
logger.With(zap.Error(err)).Fatal("Cannot create session service")
9798
}
9899

99100
// User service
100-
userService := users.NewUserService(db)
101+
userService := users.NewUserService(logger, db)
101102

102103
// Initialize all the EVSEs.
103104
err = evseManager.InitAll(ctx)
104105
if err != nil {
105-
logger.WithError(err).Fatal("Cannot init EVSEs")
106+
logger.With(zap.Error(err)).Fatal("Cannot init EVSEs")
106107
}
107108

108109
// Setup GRPC API if enabled
109110
if runtimeSettings.GRPC.Enabled {
110111
server, err := grpc.NewServer(runtimeSettings.GRPC, handler, tagManager, evseManager, settingsManager, userService)
111112
if err != nil {
112-
logger.WithError(err).Fatal("Cannot create the API server")
113+
logger.With(zap.Error(err)).Fatal("Cannot create the API server")
113114
}
114115
defer server.Stop()
115116

116117
go func() {
117118
err = server.Run()
118119
if err != nil {
119-
logger.WithError(err).Fatal("Cannot start the API server")
120+
logger.With(zap.Error(err)).Fatal("Cannot start the API server")
120121
}
121122
}()
122123
}
@@ -142,31 +143,31 @@ func runCommand() *cobra.Command {
142143
hardware,
143144
)
144145
if err != nil {
145-
logger.WithError(err).Fatal("Unable to create charge point")
146+
logger.With(zap.Error(err)).Fatal("Unable to create charge point")
146147
}
147148

148149
err = handler.SetSettings(chargePointInfo)
149150
if err != nil {
150-
logger.WithError(err).Fatal("Unable to set the charge point settings")
151+
logger.With(zap.Error(err)).Fatal("Unable to set the charge point settings")
151152
}
152153

153154
err = handler.SetConnectionSettings(connectionSettings)
154155
if err != nil {
155-
logger.WithError(err).Fatal("Unable to set the connection settings")
156+
logger.With(zap.Error(err)).Fatal("Unable to set the connection settings")
156157
}
157158

158159
// Listen for connector status changes
159160
go handler.ListenForConnectorStatusChange(ctx)
160161

161162
serverUrl, err := chargepoint.CreateConnectionUrl(connectionSettings)
162163
if err != nil {
163-
logger.WithError(err).Fatal("Cannot create connection URL")
164+
logger.With(zap.Error(err)).Fatal("Cannot create connection URL")
164165
}
165166

166167
// Connect the charge point to the backend
167168
err = handler.Connect(parentCtxForOcpp, serverUrl)
168169
if err != nil {
169-
logger.WithError(err).Fatal("Cannot connect to the central system")
170+
logger.With(zap.Error(err)).Fatal("Cannot connect to the central system")
170171
}
171172

172173
// Wait for the termination signal

‎cmd/version.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package cmd
22

33
import (
4-
chargePoint "github.com/ChargePi/ChargePi-go/internal/chargepoint"
54
"github.com/spf13/cobra"
65
"go.uber.org/zap"
6+
7+
chargePoint "github.com/ChargePi/ChargePi-go/internal/chargepoint"
78
)
89

910
// versionCmd represents the version command

0 commit comments

Comments
 (0)