SCFF-20 Modifications in order to anyone can run the project

Author: nmillalaf

caching/caching_boltdb.go

@@ -3,7 +3,7 @@ package caching
 import (
 	"fmt"
 	"github.com/boltdb/bolt"
-	"github.com/cloudfoundry-community/firehose-to-syslog/logging"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
 	cfClient "github.com/cloudfoundry-community/go-cfclient"
 	json "github.com/mailru/easyjson"
 	"log"

caching/cachingfakes/fake_caching.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cloudfoundry-community/firehose-to-syslog/caching"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching"
 )
 
 type FakeCaching struct {

eventRouting/eventRouting_test.go

@@ -1,7 +1,7 @@
 package eventRouting_test
 
 import (
-	. "github.com/cloudfoundry-community/firehose-to-syslog/caching/cachingfakes"
+	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching/cachingfakes"
 	. "github.com/cloudfoundry-community/firehose-to-syslog/eventRouting"
 	. "github.com/cloudfoundry-community/firehose-to-syslog/logging/loggingfakes"
 	. "github.com/cloudfoundry/sonde-go/events"

eventRouting/eventrouting.go

@@ -3,10 +3,10 @@ package eventRouting
 import (
 	"fmt"
 	"github.com/Sirupsen/logrus"
-	"github.com/cloudfoundry-community/firehose-to-syslog/caching"
-	fevents "github.com/cloudfoundry-community/firehose-to-syslog/events"
-	"github.com/cloudfoundry-community/firehose-to-syslog/extrafields"
-	"github.com/cloudfoundry-community/firehose-to-syslog/logging"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching"
+	fevents "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/events"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/extrafields"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
 	"github.com/cloudfoundry/sonde-go/events"
 	"os"
 	"sort"

events/events.go

@@ -3,8 +3,8 @@ package events
 import (
 	"fmt"
 	"github.com/Sirupsen/logrus"
-	"github.com/cloudfoundry-community/firehose-to-syslog/caching"
-	"github.com/cloudfoundry-community/firehose-to-syslog/utils"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/utils"
 	"github.com/cloudfoundry/sonde-go/events"
 )
 

events/events_test.go

@@ -1,8 +1,8 @@
 package events_test
 
 import (
-	. "github.com/cloudfoundry-community/firehose-to-syslog/caching"
-	. "github.com/cloudfoundry-community/firehose-to-syslog/caching/cachingfakes"
+	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching"
+	. "bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching/cachingfakes"
 	fevents "github.com/cloudfoundry-community/firehose-to-syslog/events"
 	. "github.com/cloudfoundry/sonde-go/events"
 	. "github.com/onsi/ginkgo"

firehoseclient/firehoseclient.go

@@ -2,8 +2,8 @@ package firehoseclient
 
 import (
 	"crypto/tls"
-	"github.com/cloudfoundry-community/firehose-to-syslog/eventRouting"
-	"github.com/cloudfoundry-community/firehose-to-syslog/logging"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/eventRouting"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
 	"github.com/cloudfoundry-community/go-cfclient"
 	"github.com/cloudfoundry/noaa/consumer"
 	"github.com/cloudfoundry/sonde-go/events"

logging/logging_logrus.go

@@ -18,6 +18,7 @@ type LoggingLogrus struct {
 }
 
 func NewLogging(SyslogServerFlag string, SysLogProtocolFlag string, LogFormatterFlag string, DebugFlag bool) Logging {
+
 	return &LoggingLogrus{
 		Logger:           logrus.New(),
 		syslogServer:     SyslogServerFlag,
@@ -37,9 +38,10 @@ func (l *LoggingLogrus) Connect() bool {
 	} else {
 		l.Logger.Out = os.Stdout
 	}
-
+	//fmt.Println("using [%s] as l.syslogServer", l.syslogServer)
 	if l.syslogServer != "" {
 		hook, err := logrus_syslog.NewSyslogHook(l.syslogProtocol, l.syslogServer, syslog.LOG_INFO, "doppler")
+		//fmt.Println("error [%s] as l.syslogServer", err)
 		if err != nil {
 			LogError(fmt.Sprintf("Unable to connect to syslog server [%s]!\n", l.syslogServer), err.Error())
 		} else {

main.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"log"
 	"os"
-	"github.com/cloudfoundry-community/firehose-to-syslog/caching"
-	"github.com/cloudfoundry-community/firehose-to-syslog/eventRouting"
-	"github.com/cloudfoundry-community/firehose-to-syslog/firehoseclient"
-	"github.com/cloudfoundry-community/firehose-to-syslog/logging"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/eventRouting"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/firehoseclient"
+	"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/logging"
 	"github.com/cloudfoundry-community/go-cfclient"
 	"github.com/pkg/profile"
 	"gopkg.in/alecthomas/kingpin.v2"
@@ -124,7 +124,9 @@ func main() {
 		IdleTimeoutSeconds:     *keepAlive,
 		FirehoseSubscriptionID: *subscriptionId,
 	}
-
+	logging.LogStd(fmt.Sprintf("connect logging '%s'",loggingClient.Connect()), true)
+	logging.LogStd(fmt.Sprintf("using '%s' as syslogServer", syslogServer), true)
+	logging.LogStd(fmt.Sprintf("using '%s' as syslogServer",  *debug), true)
 	if loggingClient.Connect() || *debug {
 
 		logging.LogStd("Connected to Syslog Server! Connecting to Firehose...", true)