Merge branch 'feature/sandbar-integration'

# Conflicts:
#	store.go

store.go

@@ -109,10 +109,11 @@ type SMTP struct {
 }
 
 type Settings struct {
-	DashboardURL string `json:"dashboardUrl"`
-	AcmeEmail    string `json:"acmeEmail"`
-	AcmeStaging  bool   `json:"acmeStaging"`
-	SMTP         SMTP   `json:"smtp"`
+	DashboardURL string      `json:"dashboardUrl"`
+	AcmeEmail    string      `json:"acmeEmail"`
+	AcmeStaging  bool        `json:"acmeStaging"`
+	SMTP         SMTP        `json:"smtp"`
+	Sandbar      SandbarSync `json:"sandbar"`
 	// SelfEdgeID is this server's own edge (see HAMMERHEAD_SELF_DOMAIN).
 	SelfEdgeID string `json:"selfEdgeId,omitempty"`
 }
@@ -221,6 +222,9 @@ type Server struct {
 
 	expose map[string]time.Time // deadline of each ephemeral mapping, by ID (see expose.go)
 
+	sandbarMu     sync.Mutex        // one monitor sync at a time (see sandbar.go)
+	sandbarStatus sandbarSyncStatus // how the last one went
+
 	logs *logStore
 	db   *DB
 	stop chan struct{}
@@ -305,6 +309,7 @@ func New(dir string, opts Options) (*Server, error) {
 	go s.housekeeping()
 	go s.exposeLoop()
 	go s.alertLoop()
+	go s.sandbarLoop()
 	return s, nil
 }