Skip to content

Commit 4ebfc8d

Browse files
committed
Update README. Log errors instead of panics.
Closes #6.
1 parent 80395ef commit 4ebfc8d

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ Usage example:
3030
**Warning:** only run this against an empty ChirpStack v4 database as this utilty
3131
will drop all tenants and users from the ChirpStack v4 database.
3232

33+
## Notes
34+
35+
* This utilty does not support [environment variables](https://www.chirpstack.io/docs/chirpstack/configuration.html#environment-variables) in configuration files, like ChirpStack does.
36+
3337
## Building from source
3438

3539
For creating a snapshot release:

main.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,8 @@ func migrateGateways() {
847847
for _, gw := range nsGateways {
848848
asGateway := ASGateway{}
849849
if err := asDB.Get(&asGateway, "select * from gateway where mac = $1", gw.GatewayID); err != nil {
850-
panic(err)
850+
log.Printf("Could not migrate gateway, GatewayID: %s, error: %s", gw.GatewayID, err)
851+
continue
851852
}
852853

853854
_, err = csDB.Exec(`
@@ -942,7 +943,8 @@ func migrateDeviceProfiles() {
942943
for _, nsDP := range nsDevProfiles {
943944
asDP := ASDeviceProfile{}
944945
if err := asDB.Get(&asDP, "select * from device_profile where device_profile_id = $1", nsDP.ID); err != nil {
945-
panic(err)
946+
log.Printf("Could not migrate device-profile, ID: %s, error: %s", nsDP.ID, err)
947+
continue
946948
}
947949

948950
codecScript := ""
@@ -1091,7 +1093,8 @@ func migrateDevices() {
10911093
asDEV := ASDevice{}
10921094
err := asDB.Get(&asDEV, "select * from device where dev_eui = $1", dev.DevEUI)
10931095
if err != nil {
1094-
panic(err)
1096+
log.Printf("Could not migrate device, DevEUI: %s, error: %s", dev.DevEUI, err)
1097+
continue
10951098
}
10961099

10971100
_, err = csDB.Exec(`
@@ -1186,7 +1189,8 @@ func migrateDeviceKeys(devEUI []byte) {
11861189
deviceKeys := []DeviceKeys{}
11871190
err := asDB.Select(&deviceKeys, "select * from device_keys where dev_eui = $1", devEUI)
11881191
if err != nil {
1189-
panic(err)
1192+
log.Printf("Could not migrate device-keys, DevEUI: %s, error: %s", devEUI, err)
1193+
return
11901194
}
11911195

11921196
devNonces := []int64{}

0 commit comments

Comments
 (0)