Merge remote-tracking branch 'origin/development'

Author: Jeroen Bobbeldijk

README.md

@@ -28,6 +28,7 @@ You can also wrap it in a upstart/init.d script, examples on that will come soon
 | --handle-queues        | ""               | Comma separated list of queues to handle, can't be used together with skip-queues. |
 | --queue-workers        | ""               | Amount of workers to use per queue, format: "publish_scheduler:1,entity_update:4". |
 | --default-worker-count | Amount of CPUs-1 | Default amount of workers, default value is amount of CPUs - 1. |
+| --db-password          | DB Password      | Password for the database if it can't be read by Drupal Console. |
 
 ## Compiling
 Make sure you are able to run a Go 1.6 (though 1.4/1.5 should also work) environment and that you have [Godeps](https://github.com/tools/godep) available.

directqueue.go

@@ -30,6 +30,7 @@ type Config struct {
 	Console            string
 	Site               string
 	URI                string
+	Password           string
 	HandleQueues       []string
 	SkipQueues         []string
 	QueueWorkers       map[string]int
@@ -53,6 +54,7 @@ func main() {
 		handleQueues       string
 		queueWorkers       string
 		defaultWorkerCount int
+		password           string
 	)
 
 	app.Flags = []cli.Flag{
@@ -98,6 +100,12 @@ func main() {
 			Usage:       "Default amount of workers, default value is amount of CPUs - 1.",
 			Destination: &defaultWorkerCount,
 		},
+		cli.StringFlag{
+			Name:        "db-password",
+			Value:       "",
+			Usage:       "Overwrite the db password.",
+			Destination: &password,
+		},
 	}
 
 	app.Name = "DirectQueue"
@@ -108,6 +116,7 @@ func main() {
 			Console:            console,
 			Site:               site,
 			URI:                uri,
+			Password:           password,
 			DefaultWorkerCount: defaultWorkerCount,
 			Context:            c,
 		}
@@ -375,6 +384,10 @@ func getDBConnectString(config Config) (db_connect string, err error) {
 		matches[5] = "3306"
 	}
 
+	if config.Password != "" {
+		matches[3] = config.Password
+	}
+
 	// Put together the connection details.
 	// matches[1] = --database
 	// matches[2] = --user