fix: api changes for services in next

containrrr · May 14, 2021 · b2cc2df · b2cc2df
1 parent 80c2c21
commit b2cc2df
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/pkg/services/generic/generic.go b/pkg/services/generic/generic.go
@@ -7,7 +7,6 @@ import (
 	"github.com/containrrr/shoutrrr/pkg/services/standard"
 	"github.com/containrrr/shoutrrr/pkg/types"
 	"io"
-	"log"
 	"net/http"
 	"net/url"
 	"strings"
@@ -36,7 +35,7 @@ func (service *Service) Send(message string, params *types.Params) error {
 }
 
 // Initialize loads ServiceConfig from configURL and sets logger for this Service
-func (service *Service) Initialize(configURL *url.URL, logger *log.Logger) error {
+func (service *Service) Initialize(configURL *url.URL, logger types.StdLogger) error {
 	service.Logger.SetLogger(logger)
 	config, pkr := DefaultConfig()
 	service.config = config

diff --git a/pkg/services/matrix/matrix.go b/pkg/services/matrix/matrix.go
@@ -5,7 +5,6 @@ import (
 	"github.com/containrrr/shoutrrr/pkg/format"
 	"github.com/containrrr/shoutrrr/pkg/services/standard"
 	t "github.com/containrrr/shoutrrr/pkg/types"
-	"log"
 	"net/url"
 )
 
@@ -21,7 +20,7 @@ type Service struct {
 }
 
 // Initialize loads ServiceConfig from configURL and sets logger for this Service
-func (s *Service) Initialize(configURL *url.URL, logger *log.Logger) error {
+func (s *Service) Initialize(configURL *url.URL, logger t.StdLogger) error {
 	s.SetLogger(logger)
 	s.config = &Config{}
 

diff --git a/pkg/services/matrix/matrix_client.go b/pkg/services/matrix/matrix_client.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/containrrr/shoutrrr/pkg/types"
 	"io/ioutil"
-	"log"
 	"net/http"
 	"net/url"
 	"strings"
@@ -14,10 +14,10 @@ import (
 type client struct {
 	apiURL      url.URL
 	accessToken string
-	logger      *log.Logger
+	logger      types.StdLogger
 }
 
-func newClient(host string, disableTLS bool, logger *log.Logger) (c *client) {
+func newClient(host string, disableTLS bool, logger types.StdLogger) (c *client) {
 	c = &client{
 		logger: logger,
 		apiURL: url.URL{