Add back the AMQP code (hopefully temporarily)

It's likely safer for our job queue migration to have the DBHub.io
daemons be able to run with either job queue system.

That way if our new job queue code has problems we can revert to
using AMQP until the problems are fixed.

With this commit the daemons can run in either AMQP mode or job
queue server mode.  There's a hard coded boolean value near the
top of common/live_amqp.go to switch between them.

The Cypress tests pass in both modes, so things should be ok.

api/handlers.go

@@ -1340,7 +1340,7 @@ func uploadHandler(w http.ResponseWriter, r *http.Request) {
 			com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName), numBytes)
 
 		// Send a request to the job queue to set up the database
-		liveNode, err := com.LiveCreateDB(dbOwner, dbName, objectID)
+		liveNode, err := com.LiveCreateDB(com.AmqpChan, dbOwner, dbName, objectID)
 		if err != nil {
 			log.Println(err)
 			jsonErr(w, err.Error(), http.StatusInternalServerError)

api/main.go

@@ -74,7 +74,7 @@ func main() {
 	}
 
 	// Connect to job queue server
-	err = com.ConnectQueue()
+	com.AmqpChan, err = com.ConnectQueue()
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -98,11 +98,13 @@ func main() {
 	}
 
 	// Start background goroutines to handle job queue responses
-	com.ResponseWaiters = com.NewResponseReceiver()
-	com.CheckResponsesQueue = make(chan struct{})
-	com.SubmitterInstance = com.RandomString(3)
-	go com.ResponseQueueCheck()
-	go com.ResponseQueueListen()
+	if !com.UseAMQP {
+		com.ResponseWaiters = com.NewResponseReceiver()
+		com.CheckResponsesQueue = make(chan struct{})
+		com.SubmitterInstance = com.RandomString(3)
+		go com.ResponseQueueCheck()
+		go com.ResponseQueueListen()
+	}
 
 	// Load our self signed CA chain
 	ourCAPool = x509.NewCertPool()

common/config_types.go

@@ -14,6 +14,7 @@ type TomlConfig struct {
 	Live        LiveInfo
 	Memcache    MemcacheInfo
 	Minio       MinioInfo
+	MQ          MQInfo
 	Pg          PGInfo
 	Sign        SigningInfo
 	UserMgmt    UserMgmtInfo
@@ -92,6 +93,15 @@ type MinioInfo struct {
 	Server    string
 }
 
+type MQInfo struct {
+	CertFile string `toml:"cert_file"`
+	KeyFile  string `toml:"key_file"`
+	Password string `toml:"password"`
+	Port     int    `toml:"port"`
+	Server   string `toml:"server"`
+	Username string `toml:"username"`
+}
+
 // PGInfo contains the PostgreSQL connection parameters
 type PGInfo struct {
 	Database       string

common/cypress.go

@@ -87,7 +87,7 @@ func CypressSeed(w http.ResponseWriter, r *http.Request) {
 	// Send the live database file to our job queue backend for setup
 	dbOwner := "default"
 	dbName := "Join Testing with index.sqlite"
-	liveNode, err := LiveCreateDB(dbOwner, dbName, objectID)
+	liveNode, err := LiveCreateDB(AmqpChan, dbOwner, dbName, objectID)
 	if err != nil {
 		log.Println(err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)