Skip to content

Commit 0fcbb9e

Browse files
author
Rajat Jindal
committed
hipchat integration working
1 parent c618c29 commit 0fcbb9e

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
.idea
2+
kubewatch

cmd/root.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,6 @@ func initConfig() {
7373

7474
// If a config file is found, read it in.
7575
if err := viper.ReadInConfig(); err == nil {
76-
//fmt.Println("Using config file:", viper.ConfigFileUsed())
76+
fmt.Println("Using config file:", viper.ConfigFileUsed())
7777
}
7878
}

pkg/client/run.go

+9-8
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,20 @@ import (
2323
"github.com/skippbox/kubewatch/pkg/handlers"
2424
"github.com/skippbox/kubewatch/pkg/handlers/slack"
2525
"github.com/skippbox/kubewatch/pkg/controller"
26+
"github.com/skippbox/kubewatch/pkg/handlers/hipchat"
2627
)
2728

2829
// Run runs the event loop processing with given handler
2930
func Run(conf *config.Config) {
3031
var eventHandler handlers.Handler
31-
//switch {
32-
//case len(conf.Handler.Slack.Channel) > 0 || len(conf.Handler.Slack.Token) > 0:
33-
// eventHandler = new(slack.Slack)
34-
//default:
35-
// eventHandler = new(handlers.Default)
36-
//}
37-
//TODO: temporary fix eventHandler = slack. Will add more later.
38-
eventHandler = new(slack.Slack)
32+
switch {
33+
case len(conf.Handler.Slack.Channel) > 0 || len(conf.Handler.Slack.Token) > 0:
34+
eventHandler = new(slack.Slack)
35+
case len(conf.Handler.Hipchat.Room) > 0 || len(conf.Handler.Hipchat.Token) > 0:
36+
eventHandler = new(hipchat.Hipchat)
37+
default:
38+
eventHandler = new(handlers.Default)
39+
}
3940

4041
if err := eventHandler.Init(conf); err != nil {
4142
log.Fatal(err)

pkg/handlers/hipchat/hipchat.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func notifyHipchat(s *Hipchat, obj interface{}, action string) {
118118

119119
func checkMissingHipchatVars(s *Hipchat) error {
120120
if s.Token == "" || s.Room == "" {
121-
return fmt.Errorf(hipchatErrMsg, "Missing hipchat token or channel")
121+
return fmt.Errorf(hipchatErrMsg, "Missing hipchat token or room")
122122
}
123123

124124
return nil

0 commit comments

Comments
 (0)