Skip to content
Snippets Groups Projects
Commit 653ddd10 authored by Jake Taylor's avatar Jake Taylor :lips:
Browse files

fix for credentials path

parent 8d48fe27
No related branches found
No related tags found
No related merge requests found
...@@ -57,7 +57,10 @@ var rootCmd = &cobra.Command{ ...@@ -57,7 +57,10 @@ var rootCmd = &cobra.Command{
certPath := viper.GetString("certPath") certPath := viper.GetString("certPath")
keyPath := viper.GetString("keyPath") keyPath := viper.GetString("keyPath")
localAddress := fmt.Sprintf("0.0.0.0:%d", viper.GetInt("port")) localAddress := fmt.Sprintf("0.0.0.0:%d", viper.GetInt("port"))
fbCreds := viper.GetString("firebaseCredentialsPath") fbCreds, err := utils.ExpandPath(viper.GetString("firebaseCredentialsPath"))
if err != nil {
jww.FATAL.Panicf("Unable to expand credentials path: %+v", err)
}
// Populate params // Populate params
NotificationParams = notifications.Params{ NotificationParams = notifications.Params{
...@@ -66,13 +69,15 @@ var rootCmd = &cobra.Command{ ...@@ -66,13 +69,15 @@ var rootCmd = &cobra.Command{
KeyPath: keyPath, KeyPath: keyPath,
FBCreds: fbCreds, FBCreds: fbCreds,
} }
jww.INFO.Println("Starting Notifications...")
// Start notifications server
jww.INFO.Println("Starting Notifications...")
impl, err := notifications.StartNotifications(NotificationParams, noTLS, false) impl, err := notifications.StartNotifications(NotificationParams, noTLS, false)
if err != nil { if err != nil {
jww.FATAL.Panicf("Failed to start notifications server: %+v", err) jww.FATAL.Panicf("Failed to start notifications server: %+v", err)
} }
// Initialize the storage backend
impl.Storage = storage.NewDatabase( impl.Storage = storage.NewDatabase(
viper.GetString("dbUsername"), viper.GetString("dbUsername"),
viper.GetString("dbPassword"), viper.GetString("dbPassword"),
...@@ -80,6 +85,7 @@ var rootCmd = &cobra.Command{ ...@@ -80,6 +85,7 @@ var rootCmd = &cobra.Command{
viper.GetString("dbAddress"), viper.GetString("dbAddress"),
) )
// Set up the notifications server connections
err = setupConnection(impl, viper.GetString("permissioningCertPath"), viper.GetString("permissioningAddress")) err = setupConnection(impl, viper.GetString("permissioningCertPath"), viper.GetString("permissioningAddress"))
if err != nil { if err != nil {
jww.FATAL.Panicf("Failed to set up connections: %+v", err) jww.FATAL.Panicf("Failed to set up connections: %+v", err)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment