simplifying configs to fix a bug with worker id

Author: or-else

INSTALL.md

@@ -28,6 +28,7 @@ The value of `buildstamp` will be sent by the server to the clients.
 
 ## Running a Standalone Server
 
+
 1. Run RethinkDB:
 	```
 	rethinkdb --bind all --daemon
@@ -48,7 +49,7 @@ The value of `buildstamp` will be sent by the server to the clients.
 
 4. Run server 
 	```
-	$GOPATH/bin/server -config=$GOPATH/src/github.com/tinode/chat/server/tinode.conf-example -static_data=$HOME/tinode/example-react-js/
+	$GOPATH/bin/server -config=$GOPATH/src/github.com/tinode/chat/server/tinode.conf -static_data=$HOME/tinode/example-react-js/
 	```
 
 5. Test your installation by pointing your browser to [http://localhost:6060/x/](http://localhost:6060/x/). Keep in mind that by default the static files from the `-static_data` path are served at `/x/`. You can change this by editing the line `static_mount` in the config file.
@@ -59,16 +60,18 @@ The value of `buildstamp` will be sent by the server to the clients.
 
 - Install RethinkDB, run it stanalone or in [cluster mode](https://www.rethinkdb.com/docs/start-a-server/#a-rethinkdb-cluster-using-multiple-machines). Run DB initializer, unpack JS files as described in the previous section.
 
-- Cluster expects at least two nodes. A minimum of three nodes is recommended. A sample cluster config file is provided as `cluster.conf`. The following section configures the cluster.
+- Cluster expects at least two nodes. A minimum of three nodes is recommended. 
+
+- The following section configures the cluster.
 
 ```
 	"cluster_config": {
+		"self": "",
 		"nodes": [
 			{"name": "one", "addr":"localhost:12001"},
 			{"name": "two", "addr":"localhost:12002"},
 			{"name": "three", "addr":"localhost:12003"}
 		],
-		"self": "one",
 		"failover": {
 			"enabled": true,
 			"heartbeat": 100,
@@ -77,8 +80,8 @@ The value of `buildstamp` will be sent by the server to the clients.
 		}
 	}
 ```
+* `self` is the name of the current node. Generally it's more convenient to specify the name of the current node at the command line using `cluster_self` option. Command line value overrides the config file value. If the value is not provided either in the config file or through the command line, the clustering is disabled. 
 * `nodes` defines individual cluster nodes. The sample defines three nodes named `one`, `two`, and `tree` running at the localhost at the specified cluster communication ports. Cluster addresses don't need to be exposed to the outside world.
-* `self` is the name of the current node. Generally it's more convenient to specify the name of the current node at the command line using `cluster_self` option. Command line value overrides the config file value.
 * `failover` is an experimental feature which migrates topics from failed cluster nodes keeping them accessible:
   * `enabled` turns on failover mode; failover mode requires at least three nodes in the cluster.
   * `heartbeat` interval in milliseconds between heartbeats sent by the leader node to follower nodes to ensure they are accessible.
@@ -87,8 +90,8 @@ The value of `buildstamp` will be sent by the server to the clients.
 
 If you are testing the cluster with all nodes running on the same host, you also must override the `listen` port. Here is an example for launching two cluster nodes from the same host using the same config file:
 ```
-./server -config=./cluster.conf -static_data=./example-react-js/ -listen=:6060 -cluster_self=one &
-./server -config=./cluster.conf -static_data=./example-react-js/ -listen=:6061 -cluster_self=two &
+./server -config=./tinode.conf -static_data=./example-react-js/ -listen=:6060 -cluster_self=one &
+./server -config=./tinode.conf -static_data=./example-react-js/ -listen=:6061 -cluster_self=two &
 ```
 
 ### Note on Running the Server in Background
@@ -112,14 +115,12 @@ For more details see https://github.com/tinode/chat/issues/25.
 
 2. Make sure MySQL (or MariaDB or Percona) is installed and running. The code has been tested with MySQL 5.7 but should work with earlier versions as well.
 
-3. Rename `tinode.conf-example` to `tinode.conf`
-
-4. Open `tinode.conf`. In the section `"store_config"` find `"use_adapter": "rethinkdb"` and replace it with `"use_adapter": "mysql"`. Check that the [DSN](https://github.com/go-sql-driver/mysql#dsn-data-source-name) in `"mysql"` section is appropriate for your MySQL installation. Option `parseTime=true` is required. 
+3. Open `tinode.conf`. In the section `"store_config"` find `"use_adapter": "rethinkdb"` and replace it with `"use_adapter": "mysql"`. Check that the [DSN](https://github.com/go-sql-driver/mysql#dsn-data-source-name) in `"mysql"` section is appropriate for your MySQL installation. Option `parseTime=true` is required. 
 ```js
 	"mysql": {
 		"dsn": "root@tcp(localhost)/tinode?parseTime=true",
 		"database": "tinode"
 	},
 ```
 
-5. Follow the instructions for running as a standalone server from step 2.
+4. Follow the instructions for running as a standalone server from step 2.

README.md

@@ -26,7 +26,7 @@ A text-only [command line client](./tn-cli) implements every possible command.
 
 * User `Tino` is a [basic chatbot](./chatbot) which responds with a [random quote](http://fortunes.cat-v.org/) to any message.
 
-* When you register a new account you are asked for an email. Usually the email is expected be verified by sending a message with a code but the demo server is configured not to send anything to the given email. It will accept `123456` as a verification code instead. 
+* As generally accepted, when you register a new account you are asked for an email address. The server will send an email with a verification code to that address and you can use it to validate the account. To make things easier for testing, the server will also accept `123456` as a verification code. Remove line `"debug_response": "123456"` from `tinode.conf` to disable this option. 
 
 * The demo server is configured to use [ACME](https://letsencrypt.org/) TLS [implementation](https://godoc.org/golang.org/x/crypto/acme) with hard-coded requirement for [SNI](https://en.wikipedia.org/wiki/Server_Name_Indication). If you are unable to connect then the most likely reason is your TLS client's missing support for SNI. Use a different client. 
 

server/auth/token/auth_token.go

@@ -62,7 +62,7 @@ func (ta *authenticator) Init(jsonconf string) error {
 		return errors.New("auth_token: failed to parse config: " + err.Error() + "(" + jsonconf + ")")
 	}
 
-	if config.Key == nil || len(config.Key) < tokenMinHmacLength {
+	if len(config.Key) < tokenMinHmacLength {
 		return errors.New("auth_token: the key is missing or too short")
 	}
 	if config.ExpireIn <= 0 {

server/cluster.go

@@ -7,6 +7,7 @@ import (
 	"log"
 	"net"
 	"net/rpc"
+	"sort"
 	"sync"
 	"time"
 
@@ -258,6 +259,9 @@ type Cluster struct {
 	// Name of the local node
 	thisNodeName string
 
+	// Resolved address to listed on
+	listenOn string
+
 	// Socket for inbound connections
 	inbound *net.TCPListener
 	// Ring hash for mapping topic names to nodes
@@ -414,37 +418,47 @@ func (c *Cluster) sessionGone(sess *Session) error {
 	return nil
 }
 
-func clusterInit(configString json.RawMessage, self *string) {
+// Returns snowflake worker id
+func clusterInit(configString json.RawMessage, self *string) int {
 	if globals.cluster != nil {
-		log.Fatal("Cluster already initialized")
+		log.Fatal("Cluster already initialized.")
 	}
 
 	// This is a standalone server, not initializing
-	if configString == nil || len(configString) == 0 {
+	if len(configString) == 0 {
 		log.Println("Running as a standalone server.")
-		return
+		return 1
 	}
 
 	var config clusterConfig
 	if err := json.Unmarshal(configString, &config); err != nil {
 		log.Fatal(err)
 	}
 
-	gob.Register([]interface{}{})
-	gob.Register(map[string]interface{}{})
-
 	thisName := *self
 	if thisName == "" {
 		thisName = config.ThisName
 	}
+
+	// Name of the current node is not specified - disable clustering
+	if thisName == "" {
+		log.Println("Running as a standalone server.")
+		return 1
+	}
+
+	gob.Register([]interface{}{})
+	gob.Register(map[string]interface{}{})
+
 	globals.cluster = &Cluster{
 		thisNodeName: thisName,
 		nodes:        make(map[string]*ClusterNode)}
 
-	listenOn := ""
+	var nodeNames []string
 	for _, host := range config.Nodes {
-		if host.Name == globals.cluster.thisNodeName {
-			listenOn = host.Addr
+		nodeNames = append(nodeNames, host.Name)
+
+		if host.Name == thisName {
+			globals.cluster.listenOn = host.Addr
 			// Don't create a cluster member for this local instance
 			continue
 		}
@@ -453,7 +467,6 @@ func clusterInit(configString json.RawMessage, self *string) {
 			address: host.Addr,
 			name:    host.Name,
 			done:    make(chan bool, 1)}
-		go n.reconnect()
 
 		globals.cluster.nodes[host.Name] = &n
 	}
@@ -467,21 +480,10 @@ func clusterInit(configString json.RawMessage, self *string) {
 		globals.cluster.rehash(nil)
 	}
 
-	addr, err := net.ResolveTCPAddr("tcp", listenOn)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	globals.cluster.inbound, err = net.ListenTCP("tcp", addr)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	rpc.Register(globals.cluster)
-	go rpc.Accept(globals.cluster.inbound)
+	sort.Strings(nodeNames)
+	workerId := sort.SearchStrings(nodeNames, thisName) + 1
 
-	log.Printf("Cluster of %d nodes initialized, node '%s' listening on [%s]", len(globals.cluster.nodes)+1,
-		globals.cluster.thisNodeName, listenOn)
+	return workerId
 }
 
 // This is a session handler at a master node: forward messages from the master to the session origin.
@@ -537,6 +539,38 @@ func (sess *Session) closeRPC() {
 	}
 }
 
+// Start accepting connections.
+func (c *Cluster) start() {
+	addr, err := net.ResolveTCPAddr("tcp", c.listenOn)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	c.inbound, err = net.ListenTCP("tcp", addr)
+
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	for _, n := range c.nodes {
+		go n.reconnect()
+	}
+
+	if c.fo != nil {
+		go c.run()
+	}
+
+	err = rpc.Register(c)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	go rpc.Accept(c.inbound)
+
+	log.Printf("Cluster of %d nodes initialized, node '%s' listening on [%s]", len(globals.cluster.nodes)+1,
+		globals.cluster.thisNodeName, c.listenOn)
+}
+
 func (c *Cluster) shutdown() {
 	if globals.cluster == nil {
 		return

server/cluster_leader.go

@@ -87,7 +87,7 @@ func (c *Cluster) failoverInit(config *clusterFailoverConfig) bool {
 		return false
 	}
 	if len(c.nodes) < 2 {
-		log.Printf("cluster: failover disabled; need at least 3 nodes, got %d only", len(c.nodes)+1)
+		log.Printf("cluster: failover disabled; need at least 3 nodes, got %d", len(c.nodes)+1)
 		return false
 	}
 
@@ -114,8 +114,6 @@ func (c *Cluster) failoverInit(config *clusterFailoverConfig) bool {
 		electionVote:       make(chan *ClusterVote, len(c.nodes)),
 		done:               make(chan bool, 1)}
 
-	go c.run()
-
 	log.Println("cluster: failover mode enabled")
 
 	return true

server/db/mysql/adapter.go

@@ -341,7 +341,7 @@ func (a *adapter) CreateDb(reset bool) error {
 			createdat 	DATETIME(3) NOT NULL,
 			updatedat 	DATETIME(3) NOT NULL,	
 			method 		VARCHAR(16) NOT NULL,
-			value		VARCHAR(128) NOT NULL,
+			value		VARCHAR(192) NOT NULL,
 			synthetic	VARCHAR(255) NOT NULL,
 			userid 		BIGINT NOT NULL,
 			resp		VARCHAR(255),