MF-788 - Remove date and minimize copyright comments (#876)

* Update copyright comment for go files

Signed-off-by: nwneisen <nwneisen@gmail.com>

* Update copyright in assortment of file types

Signed-off-by: nwneisen <nwneisen@gmail.com>

* Remove missed copyright date

Signed-off-by: nwneisen <nwneisen@gmail.com>
This commit is contained in:
Nick Neisen
2019-10-07 08:14:47 -06:00
committed by Drasko DRASKOVIC
parent 23dff53a08
commit 66487eda42
281 changed files with 357 additions and 1403 deletions
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package mainflux
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package api contains implementation of bootstrap service HTTP API.
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api_test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// +build !test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// +build !test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package bootstrap
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package bootstrap contains the domain concept definitions needed to support
// Mainflux bootstrap service functionality.
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package mocks
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package mocks
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package mocks
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package postgres
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package postgres_test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package postgres contains repository implementations using PostgreSQL as
// the underlying database.
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package postgres
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package postgres_test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package bootstrap
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package bootstrap_test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package consumer contains events consumer for events
// published by Things service.
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package consumer
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package consumer
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package producer contains the domain events needed to support
// event sourcing of Bootstrap service actions.
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package producer
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package producer_test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package producer
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package producer_test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package bootstrap
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package bootstrap_test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package bootstrap
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package cli
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package cli
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package cli
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package cli
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package cli
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package cli
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package cli
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package cli
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
import (
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package main
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package coap contains the domain concept definitions needed to support
// Mainflux coap adapter service functionality. All constant values are taken
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package api contains API-related concerns: endpoint definitions, middlewares
// and all resource representations.
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// +build !test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// +build !test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package nats contains NATS message publisher implementation.
package nats
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package coap
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package mainflux acts as an umbrella package containing multiple different
// microservices and defines all shared domain concepts.
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package mainflux
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package http contains the domain concept definitions needed to support
// Mainflux http adapter service functionality.
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package api contains API-related concerns: endpoint definitions, middlewares
// and all resource representations.
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api_test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// +build !test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// +build !test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package mocks
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package mocks
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package nats contains NATS message publisher implementation.
package nats
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
syntax = "proto3";
@@ -1,7 +1,5 @@
/*
* Copyright (c) 2018
* Mainflux
*
* Copyright (c) Mainflux
* SPDX-License-Identifier: Apache-2.0
*/
@@ -1,7 +1,5 @@
/*
* Copyright (c) 2018
* Mainflux
*
* Copyright (c) Mainflux
* SPDX-License-Identifier: Apache-2.0
*/
@@ -1,7 +1,5 @@
/*
* Copyright (c) 2018
* Mainflux
*
* Copyright (c) Mainflux
* SPDX-License-Identifier: Apache-2.0
*/
@@ -1,7 +1,5 @@
/*
* Copyright (c) 2018
* Mainflux
*
* Copyright (c) Mainflux
* SPDX-License-Identifier: Apache-2.0
*/
@@ -1,7 +1,5 @@
/*
* Copyright (c) 2018
* Mainflux
*
* Copyright (c) Mainflux
* SPDX-License-Identifier: Apache-2.0
*/
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package logger contains logger API definition, wrapper that
// can be used around any other logger.
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package logger
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package logger
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package logger_test
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package nats contains NATS message publisher implementation.
package nats
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package redis
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package lora
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
syntax = "proto3";
package mainflux;
+20 -22
View File
@@ -1,11 +1,9 @@
#
# Copyright (c) 2018
# Mainflux
#
# Copyright (c) Mainflux
# SPDX-License-Identifier: Apache-2.0
#
copyright: Copyright (c) 2015-2019 Mainflux
copyright: Copyright (c) Mainflux
repo_url: https://github.com/mainflux/mainflux
site_description: Mainflux IoT System
site_name: Mainflux
@@ -20,23 +18,23 @@ extra:
markdown_extensions:
- admonition
- toc:
permalink: '#'
permalink: "#"
pages:
- Overview:
- About: index.md
- Contributing: CONTRIBUTING.md
- License: LICENSE.txt
- Architecture: architecture.md
- Getting Started: getting-started.md
- Provisioning: provisioning.md
- Messaging: messaging.md
- Storage: storage.md
- LoRa: lora.md
- Security:
- Secure communication: security.md
- Authentication: authentication.md
- CLI: cli.md
- Bootstrap: bootstrap.md
- Developer's Guide: dev-guide.md
- Load Test: load-test.md
- Overview:
- About: index.md
- Contributing: CONTRIBUTING.md
- License: LICENSE.txt
- Architecture: architecture.md
- Getting Started: getting-started.md
- Provisioning: provisioning.md
- Messaging: messaging.md
- Storage: storage.md
- LoRa: lora.md
- Security:
- Secure communication: security.md
- Authentication: authentication.md
- CLI: cli.md
- Bootstrap: bootstrap.md
- Developer's Guide: dev-guide.md
- Load Test: load-test.md
+29 -21
View File
@@ -1,6 +1,4 @@
// Copyright (c) 2015-2019
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
'use strict';
@@ -36,15 +34,17 @@ var config = {
es_pass: process.env.MF_MQTT_ADAPTER_ES_PASS || 'mqtt',
es_db: Number(process.env.MF_MQTT_ADAPTER_ES_DB) || 0,
client_tls: (process.env.MF_MQTT_ADAPTER_CLIENT_TLS == 'true') || false,
ca_certs: process.env.MF_MQTT_ADAPTER_CA_CERTS || '',
ca_certs: process.env.MF_MQTT_ADAPTER_CA_CERTS || '',
concurrency: Number(process.env.MF_MQTT_CONCURRENT_MESSAGES) || 100,
auth_url: process.env.MF_THINGS_URL || 'localhost:8181',
schema_dir: process.argv[2] || '.',
},
logger = bunyan.createLogger({name: 'mqtt', level: config.log_level}),
logger = bunyan.createLogger({
name: 'mqtt',
level: config.log_level
}),
packageDefinition = protoLoader.loadSync(
config.schema_dir + '/internal.proto',
{
config.schema_dir + '/internal.proto', {
keepCase: true,
longs: String,
enums: String,
@@ -81,7 +81,7 @@ var config = {
persistence: aedesRedis,
concurrency: config.concurrency
}),
things = (function() {
things = (function () {
var certs;
if (config.client_tls) {
certs = grpc.credentials.createSsl(config.ca_certs);
@@ -91,7 +91,7 @@ var config = {
return new thingsSchema.ThingsService(config.auth_url, certs);
})(),
esclient = redis.createClient({
port: config.es_port,
port: config.es_port,
host: config.es_host,
password: config.es_pass,
db: config.es_db
@@ -104,12 +104,14 @@ var config = {
logging({
instance: aedes,
servers: servers,
pinoOptions: {level: 30}
pinoOptions: {
level: 30
}
});
logger.level(config.log_level);
esclient.on('error', function(err) {
esclient.on('error', function (err) {
logger.warn('error on redis connection: %s', err.message);
});
@@ -124,8 +126,10 @@ function startWs() {
}
res.statusCode = 404;
res.end('{"service":"mqtt-adpater", "message": "not found"}')
});
websocket.createServer({server: server}, aedes.handle);
});
websocket.createServer({
server: server
}, aedes.handle);
server.listen(config.ws_port);
return server;
}
@@ -134,7 +138,9 @@ function startMqtt() {
return net.createServer(aedes.handle).listen(config.mqtt_port);
}
nats.subscribe('channel.>', {'queue':'mqtts'}, function (msg) {
nats.subscribe('channel.>', {
'queue': 'mqtts'
}, function (msg) {
var m = RawMessage.decode(msg),
packet, subtopic, ct;
if (m && m.protocol !== 'mqtt') {
@@ -174,8 +180,8 @@ aedes.authorizePublish = function (client, packet, publish) {
},
// Parse unlimited subtopics
baseLength = 3, // First 3 elements which represents the base part of topic.
isEmpty = function(value) {
return value !== '';
isEmpty = function (value) {
return value !== '';
},
parts = packet.topic.split('/'),
elements = parts.slice(baseLength).join('.').split('.').filter(isEmpty),
@@ -251,8 +257,10 @@ aedes.authorizeSubscribe = function (client, packet, subscribe) {
aedes.authenticate = function (client, username, password, acknowledge) {
var pass = (password || '').toString(),
identity = {value: pass},
onIdentify = function(err, res) {
identity = {
value: pass
},
onIdentify = function (err, res) {
if (!err) {
client.thingId = res.value.toString() || '';
client.id = client.id || client.thingId;
@@ -283,12 +291,12 @@ aedes.on('connectionError', function (client, err) {
logger.warn('connection error: client: %s, error: %s', client.id, err.message);
});
aedes.on('error', function(err) {
aedes.on('error', function (err) {
logger.warn('aedes error: %s', err.message);
});
function publishConnEvent(id, type) {
var onPublish = function(err) {
var onPublish = function (err) {
if (err) {
logger.warn('event publish failed: %s', err);
}
@@ -299,4 +307,4 @@ function publishConnEvent(id, type) {
'event_type', type,
'instance', config.instance_id,
onPublish);
}
}
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package api
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
// Package normalizer contains the domain concept definitions needed to
// support Mainflux normalizer service functionality.
+1 -5
View File
@@ -1,9 +1,5 @@
//
// Copyright (c) 2018
// Mainflux
//
// Copyright (c) Mainflux
// SPDX-License-Identifier: Apache-2.0
//
package nats

Some files were not shown because too many files have changed in this diff Show More