more logging, deal with missing physical indexes

Author: nicpottier

Diff for: cmd/rp-indexer/main.go

@@ -55,32 +55,32 @@ func main() {
 	}
 	oldIndex := physicalIndex
 
-	// doesn't exist or we are rebuilding, create it
-	if physicalIndex == "" || config.Rebuild {
-		physicalIndex, err = indexer.CreateNewIndex(config.ElasticURL, config.Index)
-		if err != nil {
-			log.WithError(err).Fatal("error creating new index")
+	for {
+		// doesn't exist or we are rebuilding, create it
+		if physicalIndex == "" || config.Rebuild {
+			physicalIndex, err = indexer.CreateNewIndex(config.ElasticURL, config.Index)
+			if err != nil {
+				log.WithError(err).Fatal("error creating new index")
+			}
+			log.WithField("index", config.Index).WithField("physicalIndex", physicalIndex).Info("created new physical index")
 		}
-		log.WithField("index", config.Index).WithField("physicalIndex", physicalIndex).Info("created new physical index")
-	}
 
-	for {
 		lastModified, err := indexer.GetLastModified(config.ElasticURL, physicalIndex)
 		if err != nil {
 			logError(config.Rebuild, err, "error finding last modified")
 			continue
 		}
 
 		start := time.Now()
-		log.WithField("last_modified", lastModified).Info("indexing contacts newer than last modified")
+		log.WithField("last_modified", lastModified).WithField("index", physicalIndex).Info("indexing contacts newer than last modified")
 
 		// now index our docs
 		indexed, deleted, err := indexer.IndexContacts(db, config.ElasticURL, physicalIndex, lastModified)
 		if err != nil {
 			logError(config.Rebuild, err, "error indexing contacts")
 			continue
 		}
-		log.WithField("added", indexed).WithField("deleted", deleted).WithField("elapsed", time.Now().Sub(start)).Info("completed indexing")
+		log.WithField("added", indexed).WithField("deleted", deleted).WithField("index", physicalIndex).WithField("elapsed", time.Now().Sub(start)).Info("completed indexing")
 
 		// if the index didn't previously exist or we are rebuilding, remap to our alias
 		if oldIndex == "" || config.Rebuild {
@@ -101,6 +101,8 @@ func main() {
 			log.WithField("physicalIndexes", physicalIndexes).WithField("index", config.Index).Debug("found physical indexes")
 			if len(physicalIndex) > 0 {
 				physicalIndex = physicalIndexes[0]
+			} else {
+				oldIndex = ""
 			}
 		}
 	}

Diff for: indexer.go

@@ -59,6 +59,9 @@ func CreateNewIndex(url string, alias string) (string, error) {
 // GetLastModified queries our index and finds the last modified contact, returning it
 func GetLastModified(url string, index string) (time.Time, error) {
 	lastModified := time.Time{}
+	if index == "" {
+		return lastModified, fmt.Errorf("empty index passed to GetLastModified")
+	}
 
 	// get the newest document on our index
 	queryResponse := queryResponse{}
@@ -177,6 +180,10 @@ func IndexContacts(db *sql.DB, elasticURL string, index string, lastModified tim
 	createdCount, deletedCount := 0, 0
 	processedCount := 0
 
+	if index == "" {
+		return createdCount, deletedCount, fmt.Errorf("empty index passed to IndexContacts")
+	}
+
 	var modifiedOn time.Time
 	var contactJSON string
 	var id, orgID int64