Return error for notify

cmd/statusd/library.go

@@ -376,6 +376,25 @@ func makeJSONResponse(err error) *C.char {
 // Notify sends push notification by given token
 //export Notify
 func Notify(token *C.char) *C.char {
-	res := statusAPI.Notify(C.GoString(token))
+	err := statusAPI.Notify(C.GoString(token))
-	return C.CString(res)
+
+	res := true
+	errString := ""
+	if err != nil {
+		res = false
+		errString = err.Error()
+	}
+
+	out := common.NotifyResult{
+		Status: res,
+		Error:  errString,
+	}
+
+	outBytes, err := json.Marshal(&out)
+	if err != nil {
+		log.Error("failed to marshal Notify output", "error", err.Error())
+		return makeJSONResponse(err)
+	}
+
+	return C.CString(string(outBytes))
 }

geth/api/api.go

@@ -195,7 +195,7 @@ func (api *StatusAPI) JailBaseJS(js string) {
 }
 
 // Notify and send message.
-func (api *StatusAPI) Notify(token string) string {
+func (api *StatusAPI) Notify(token string) error {
 	log.Debug("Notify", "token", token)
 
 	// TODO(oskarth): Experiment with this
@@ -204,10 +204,10 @@ func (api *StatusAPI) Notify(token string) string {
 		"sum": "Happy Day",
 	}
 
-	err := api.b.notification.Notify(msg, token)
+	err := api.b.notifier().Notify(msg, token)
 	if err != nil {
 		log.Error("Notify failed:", err)
 	}
 
-	return token
+	return err
 }

geth/api/backend.go

@@ -29,7 +29,7 @@ type StatusBackend struct {
 	accountManager common.AccountManager
 	txQueueManager common.TxQueueManager
 	jailManager    common.JailManager
-	notification   common.Notifier
+	notifier       common.NotifierConstructor
 }
 
 // NewStatusBackend create a new NewStatusBackend instance
@@ -47,7 +47,7 @@ func NewStatusBackend() *StatusBackend {
 		accountManager: accountManager,
 		jailManager:    jailManager,
 		txQueueManager: txQueueManager,
-		notification:   notificationManager,
+		notifier:       notificationManager,
 	}
 }
 

geth/common/notification.go

@@ -4,3 +4,6 @@ package common
 type Notifier interface {
 	Notify(body interface{}, tokens ...string) error
 }
+
+// NotifierConstructor returns constructor of configured instance Notifier interface.
+type NotifierConstructor func() Notifier

geth/common/types.go

@@ -395,6 +395,12 @@ type TestConfig struct {
 	}
 }
 
+// NotifyResult is a JSON returned from notify message
+type NotifyResult struct {
+	Status bool   `json:"status"`
+	Error  string `json:"error"`
+}
+
 // LoadTestConfig loads test configuration values from disk
 func LoadTestConfig() (*TestConfig, error) {
 	var testConfig TestConfig