Merge pull request #84 from jacobmarble/monitor-local

Add privet printer quantity to monitor output.

connector-monitor/connector-monitor.go

@@ -15,6 +15,7 @@ import (
 	"os"
 	"time"
 
+	"github.com/golang/glog"
 	"github.com/google/cups-connector/lib"
 )
 
@@ -26,9 +27,16 @@ func main() {
 	flag.Parse()
 	fmt.Println(lib.FullName)
 
-	config, err := lib.ConfigFromFile()
-	if err != nil {
-		panic(err)
+	var config *lib.Config
+	if lib.ConfigFileExists() {
+		var err error
+		config, err = lib.ConfigFromFile()
+		if err != nil {
+			glog.Fatal(err)
+		}
+	} else {
+		config = &lib.DefaultConfig
+		glog.Info("No config file was found, so using defaults")
 	}
 
 	if _, err := os.Stat(config.MonitorSocketFilename); err != nil {

connector/connector.go

@@ -132,7 +132,7 @@ func main() {
 	}
 	defer pm.Quit()
 
-	m, err := monitor.NewMonitor(c, g, pm, config.MonitorSocketFilename)
+	m, err := monitor.NewMonitor(c, g, priv, pm, config.MonitorSocketFilename)
 	if err != nil {
 		glog.Fatal(err)
 	}

monitor/monitor.go

@@ -15,13 +15,15 @@ import (
 	"github.com/google/cups-connector/gcp"
 	"github.com/google/cups-connector/lib"
 	"github.com/google/cups-connector/manager"
+	"github.com/google/cups-connector/privet"
 
 	"github.com/golang/glog"
 )
 
 const monitorFormat = `cups-printers=%d
 cups-raw-printers=%d
 gcp-printers=%d
+local-printers=%d
 cups-conn-qty=%d
 cups-conn-max-qty=%d
 jobs-done=%d
@@ -32,12 +34,13 @@ jobs-in-progress=%d
 type Monitor struct {
 	cups         *cups.CUPS
 	gcp          *gcp.GoogleCloudPrint
+	p            *privet.Privet
 	pm           *manager.PrinterManager
 	listenerQuit chan bool
 }
 
-func NewMonitor(cups *cups.CUPS, gcp *gcp.GoogleCloudPrint, pm *manager.PrinterManager, socketFilename string) (*Monitor, error) {
-	m := Monitor{cups, gcp, pm, make(chan bool)}
+func NewMonitor(cups *cups.CUPS, gcp *gcp.GoogleCloudPrint, p *privet.Privet, pm *manager.PrinterManager, socketFilename string) (*Monitor, error) {
+	m := Monitor{cups, gcp, p, pm, make(chan bool)}
 
 	listener, err := net.ListenUnix("unix", &net.UnixAddr{socketFilename, "unix"})
 	if err != nil {
@@ -99,7 +102,7 @@ func (m *Monitor) Quit() {
 }
 
 func (m *Monitor) getStats() (string, error) {
-	var cupsPrinterQuantity, rawPrinterQuantity, gcpPrinterQuantity int
+	var cupsPrinterQuantity, rawPrinterQuantity, gcpPrinterQuantity, privetPrinterQuantity int
 
 	if cupsPrinters, err := m.cups.GetPrinters(); err != nil {
 		return "", err
@@ -120,14 +123,18 @@ func (m *Monitor) getStats() (string, error) {
 		}
 	}
 
+	if m.p != nil {
+		privetPrinterQuantity = m.p.Size()
+	}
+
 	jobsDone, jobsError, jobsProcessing, err := m.pm.GetJobStats()
 	if err != nil {
 		return "", err
 	}
 
 	stats := fmt.Sprintf(
 		monitorFormat,
-		cupsPrinterQuantity, rawPrinterQuantity, gcpPrinterQuantity,
+		cupsPrinterQuantity, rawPrinterQuantity, gcpPrinterQuantity, privetPrinterQuantity,
 		cupsConnOpen, cupsConnMax,
 		jobsDone, jobsError, jobsProcessing)
 

privet/privet.go

@@ -121,3 +121,10 @@ func (p *Privet) Quit() {
 		delete(p.apis, cupsPrinterName)
 	}
 }
+
+func (p *Privet) Size() int {
+	p.apisMutex.RLock()
+	defer p.apisMutex.RUnlock()
+
+	return len(p.apis)
+}