Skip to content

Commit

Permalink
(bluefox) change CRLF
Browse files Browse the repository at this point in the history
  • Loading branch information
GermanBluefox committed May 6, 2019
1 parent fb324bd commit f8ada01
Show file tree
Hide file tree
Showing 37 changed files with 13,022 additions and 13,022 deletions.
44 changes: 22 additions & 22 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
.idea
node_modules
/conf/iobroker.json
/log/iobroker.log
/lib/ioBroker.pid
/adapter/email
/adapter/sonos
/adapter/admin
/data
/npm-debug.log
/tmp
/log
pids.txt
backups
cache
/img
/test/coverage
/test/report
/conf/sources-dist.json
/package-lock.json
/.npmrc
/lib/objects/objectsInRedis.js
.idea
node_modules
/conf/iobroker.json
/log/iobroker.log
/lib/ioBroker.pid
/adapter/email
/adapter/sonos
/adapter/admin
/data
/npm-debug.log
/tmp
/log
pids.txt
backups
cache
/img
/test/coverage
/test/report
/conf/sources-dist.json
/package-lock.json
/.npmrc
/lib/objects/objectsInRedis.js
38 changes: 19 additions & 19 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
Gruntfile.js
tasks
data
conf/iobroker.json
node_modules
.idea
.git
*.md
tmp
log/*
.travis.yml
istanbul.yml
lib/*.pid
backups
cache
test
pids.txt
doc
appveyor.yml
Gruntfile.js
tasks
data
conf/iobroker.json
node_modules
.idea
.git
*.md
tmp
log/*
.travis.yml
istanbul.yml
lib/*.pid
backups
cache
test
pids.txt
doc
appveyor.yml
44 changes: 22 additions & 22 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
The MIT License (MIT)
Copyright (c) 2014-2019 bluefox<[email protected]>,
Copyright (c) 2014 hobbyquaker
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
The MIT License (MIT)

Copyright (c) 2014-2019 bluefox<[email protected]>,
Copyright (c) 2014 hobbyquaker

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
36 changes: 18 additions & 18 deletions conf/cert.crt
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
-----BEGIN CERTIFICATE-----
MIIDFjCCAf4CCQC79K8N/kVROTANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJE
RTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UECgwIaW9Ccm9rZXIxFjAUBgNV
BAMMDWlvQnJva2VyIFVzZXIwHhcNMTgwOTA5MTg1MDExWhcNMjAwOTA4MTg1MDEx
WjBNMQswCQYDVQQGEwJERTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UECgwI
aW9Ccm9rZXIxFjAUBgNVBAMMDWlvQnJva2VyIFVzZXIwggEiMA0GCSqGSIb3DQEB
AQUAA4IBDwAwggEKAoIBAQCngs/CJrOHgNfC6KA/ZiqTAP6E4g7jQQfQ2uSEZSlt
Ilo8ILpSz0nzyg+bXf0N80JJQs8bebHtSJsoC7n+MYORBQN5nVHNk/RtVcaVXHrw
A2RRAecvnv8bz+zha3D1bLCxnxqeScmXLA8cf2JtDCB9qrpIpJs+f0kJgilNlIDm
g/rek9BcD8FDUnURZ07Q3nGWdE1OeesuBYp7g/zevJA/IsKJkhVZA3zHeOWO+LIl
JCmLq1Uz4BfvkTsMWo5mftNYwTp57vtgabMoL2Z7T0clGWMt0kDPg6UUvP2n05XO
uMXmpFEuqN/Z9wTE+nrLVDRRhhKw8l06F0Nqe7rBo9rrAgMBAAEwDQYJKoZIhvcN
AQELBQADggEBAHJ4hl5Ldczy6dHo6pyugatQrnYSTit5zlYSotzOI3n3QFiWmjUP
ekm3lCBryb76Ua7USLR6ay+zrHKQgRx/S9FlHLTZNQytB9F4jJBeDNmmI3JbtZz1
dMPkbwsYONzG5Pc5iPBOLbWYWjPZOGNeURQB31X8//TvPBsn8JdzRYT+KaJwNWbj
1o0Zdj2NB7Ws5JixkMCbWOMCqr5xQ+VonordVg2Sssh2vU/7qhdFsd560julXjLK
ueX1tQmIAf34CVy41M9V42wuZ9J7C3+yFA6H5TY9TmGT7hkRxk2YN0twD2um1ZkT
4KSa87M3J/aQwP4XECsQLXwDfORXrc3adRc=
-----BEGIN CERTIFICATE-----
MIIDFjCCAf4CCQC79K8N/kVROTANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJE
RTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UECgwIaW9Ccm9rZXIxFjAUBgNV
BAMMDWlvQnJva2VyIFVzZXIwHhcNMTgwOTA5MTg1MDExWhcNMjAwOTA4MTg1MDEx
WjBNMQswCQYDVQQGEwJERTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UECgwI
aW9Ccm9rZXIxFjAUBgNVBAMMDWlvQnJva2VyIFVzZXIwggEiMA0GCSqGSIb3DQEB
AQUAA4IBDwAwggEKAoIBAQCngs/CJrOHgNfC6KA/ZiqTAP6E4g7jQQfQ2uSEZSlt
Ilo8ILpSz0nzyg+bXf0N80JJQs8bebHtSJsoC7n+MYORBQN5nVHNk/RtVcaVXHrw
A2RRAecvnv8bz+zha3D1bLCxnxqeScmXLA8cf2JtDCB9qrpIpJs+f0kJgilNlIDm
g/rek9BcD8FDUnURZ07Q3nGWdE1OeesuBYp7g/zevJA/IsKJkhVZA3zHeOWO+LIl
JCmLq1Uz4BfvkTsMWo5mftNYwTp57vtgabMoL2Z7T0clGWMt0kDPg6UUvP2n05XO
uMXmpFEuqN/Z9wTE+nrLVDRRhhKw8l06F0Nqe7rBo9rrAgMBAAEwDQYJKoZIhvcN
AQELBQADggEBAHJ4hl5Ldczy6dHo6pyugatQrnYSTit5zlYSotzOI3n3QFiWmjUP
ekm3lCBryb76Ua7USLR6ay+zrHKQgRx/S9FlHLTZNQytB9F4jJBeDNmmI3JbtZz1
dMPkbwsYONzG5Pc5iPBOLbWYWjPZOGNeURQB31X8//TvPBsn8JdzRYT+KaJwNWbj
1o0Zdj2NB7Ws5JixkMCbWOMCqr5xQ+VonordVg2Sssh2vU/7qhdFsd560julXjLK
ueX1tQmIAf34CVy41M9V42wuZ9J7C3+yFA6H5TY9TmGT7hkRxk2YN0twD2um1ZkT
4KSa87M3J/aQwP4XECsQLXwDfORXrc3adRc=
-----END CERTIFICATE-----
54 changes: 27 additions & 27 deletions conf/cert.key
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEogIBAAKCAQEAp4LPwiazh4DXwuigP2YqkwD+hOIO40EH0NrkhGUpbSJaPCC6
Us9J88oPm139DfNCSULPG3mx7UibKAu5/jGDkQUDeZ1RzZP0bVXGlVx68ANkUQHn
L57/G8/s4Wtw9WywsZ8anknJlywPHH9ibQwgfaq6SKSbPn9JCYIpTZSA5oP63pPQ
XA/BQ1J1EWdO0N5xlnRNTnnrLgWKe4P83ryQPyLCiZIVWQN8x3jljviyJSQpi6tV
M+AX75E7DFqOZn7TWME6ee77YGmzKC9me09HJRljLdJAz4OlFLz9p9OVzrjF5qRR
Lqjf2fcExPp6y1Q0UYYSsPJdOhdDanu6waPa6wIDAQABAoIBACo8JT4CnAlyRvRx
ytWxYNKn0YSXqsFJyDq0tiFbkFJf8vhuGAyBD1hUfhLiY8d8qh3mpml7CY2WXOh/
7GlW+qE57mJfdBytTVez5NoL80NI16ZFIJE1OYU9q7A6csSunu5p+0AlwppHFZhN
1fdAs4B753QhbLMZTMUE+H0DEG0OOS6zZIXGEguKj84wDEWBPg5332B2uEZd0vJ8
cZqaBuE6/igbx8sNFajUwsdQI74t7+qV1u6bdKDPEpifAd+qqc4BHGuUqiHkKhxU
FQCVNXO7KJLu5TJO3xvdYLJxvxkEvL1dw1yPi1v3Y9fl6AuP4JVoryWCNC6vlQIa
aYyzScECgYEA3Uzg5vp1Z3ucMlFvb3hp+5nqg7hh6uDGhtMsXty3BaOUABQIQE2L
EdyjQT3JJB2nx3yfCDq2DbwvUb7yBsvGsqw7NJ8lH39uBwAvXSYj4PCU2l/NjhI5
Kzxw/YWvNsOyCHB+oJVRksqxMO4DUB/xNSBK4VpEx7MHZ6/PfsvJ+KkCgYEAwcbM
dJxfa2qvVIYXEUUI4w8Zd+dtseRr7Cp9Wxg2eaOlkwDxI3Se4+p8uGT4mgP9T6U8
vPJvNfKgwjQpV9h+2Bid5+mFSwOmpiMxxzMs6r7TisFidR9D4pg2PXykoFEt8K2y
KmWc1UdAYIYRIhhFH/RrJjY/IGO+D+HY27vlT3MCgYBB1t+KmLVZRlNgPQ40UdTm
QBKfgbnQEXO/JRCsYGorSVF8/Hi/+NIJTGVdwa4YCqKiHReLcTw8teI2JeMH1pSV
D9zFeRuoVVc8yfdNdU1zXOBMX/hd7loH3QGYy68nUe2jySRDTmlojNlOv2FI81fm
AGeGyD5yU3c+h/XpuWOrkQKBgBZHdBRoMjRYdMYkEJzksgvhHY2Cp0MPvzTNAdKq
awD7RrsrHY51BxuvRx2wRkD2+nXgyqXyvcSXG9KYSrSV6KeR1P3oBHJGfi+V1lBP
2vc2b34Bk/9hU93GoF3badYg30ZPwi9LtYd0BLvUTj38Sl5NLNCc5g8kSKLs1ZEV
/lxvAoGASbkaJwc51zt8JjYXA4fOOUtP6C/ExI6D5sDtQUdl4Qgzjq5WAZEhMLDI
gVWX3ZYj9nM5p47fRhWnMmijEK9wZb7eLTLc5IV+W5oZdpr2bfnSk+u9rOZB9uMR
kNirnGlIfCHVHZqwssJa5MARIax//LvWfIfgjIEIQbituA6uTf0=
-----END RSA PRIVATE KEY-----
-----BEGIN RSA PRIVATE KEY-----
MIIEogIBAAKCAQEAp4LPwiazh4DXwuigP2YqkwD+hOIO40EH0NrkhGUpbSJaPCC6
Us9J88oPm139DfNCSULPG3mx7UibKAu5/jGDkQUDeZ1RzZP0bVXGlVx68ANkUQHn
L57/G8/s4Wtw9WywsZ8anknJlywPHH9ibQwgfaq6SKSbPn9JCYIpTZSA5oP63pPQ
XA/BQ1J1EWdO0N5xlnRNTnnrLgWKe4P83ryQPyLCiZIVWQN8x3jljviyJSQpi6tV
M+AX75E7DFqOZn7TWME6ee77YGmzKC9me09HJRljLdJAz4OlFLz9p9OVzrjF5qRR
Lqjf2fcExPp6y1Q0UYYSsPJdOhdDanu6waPa6wIDAQABAoIBACo8JT4CnAlyRvRx
ytWxYNKn0YSXqsFJyDq0tiFbkFJf8vhuGAyBD1hUfhLiY8d8qh3mpml7CY2WXOh/
7GlW+qE57mJfdBytTVez5NoL80NI16ZFIJE1OYU9q7A6csSunu5p+0AlwppHFZhN
1fdAs4B753QhbLMZTMUE+H0DEG0OOS6zZIXGEguKj84wDEWBPg5332B2uEZd0vJ8
cZqaBuE6/igbx8sNFajUwsdQI74t7+qV1u6bdKDPEpifAd+qqc4BHGuUqiHkKhxU
FQCVNXO7KJLu5TJO3xvdYLJxvxkEvL1dw1yPi1v3Y9fl6AuP4JVoryWCNC6vlQIa
aYyzScECgYEA3Uzg5vp1Z3ucMlFvb3hp+5nqg7hh6uDGhtMsXty3BaOUABQIQE2L
EdyjQT3JJB2nx3yfCDq2DbwvUb7yBsvGsqw7NJ8lH39uBwAvXSYj4PCU2l/NjhI5
Kzxw/YWvNsOyCHB+oJVRksqxMO4DUB/xNSBK4VpEx7MHZ6/PfsvJ+KkCgYEAwcbM
dJxfa2qvVIYXEUUI4w8Zd+dtseRr7Cp9Wxg2eaOlkwDxI3Se4+p8uGT4mgP9T6U8
vPJvNfKgwjQpV9h+2Bid5+mFSwOmpiMxxzMs6r7TisFidR9D4pg2PXykoFEt8K2y
KmWc1UdAYIYRIhhFH/RrJjY/IGO+D+HY27vlT3MCgYBB1t+KmLVZRlNgPQ40UdTm
QBKfgbnQEXO/JRCsYGorSVF8/Hi/+NIJTGVdwa4YCqKiHReLcTw8teI2JeMH1pSV
D9zFeRuoVVc8yfdNdU1zXOBMX/hd7loH3QGYy68nUe2jySRDTmlojNlOv2FI81fm
AGeGyD5yU3c+h/XpuWOrkQKBgBZHdBRoMjRYdMYkEJzksgvhHY2Cp0MPvzTNAdKq
awD7RrsrHY51BxuvRx2wRkD2+nXgyqXyvcSXG9KYSrSV6KeR1P3oBHJGfi+V1lBP
2vc2b34Bk/9hU93GoF3badYg30ZPwi9LtYd0BLvUTj38Sl5NLNCc5g8kSKLs1ZEV
/lxvAoGASbkaJwc51zt8JjYXA4fOOUtP6C/ExI6D5sDtQUdl4Qgzjq5WAZEhMLDI
gVWX3ZYj9nM5p47fRhWnMmijEK9wZb7eLTLc5IV+W5oZdpr2bfnSk+u9rOZB9uMR
kNirnGlIfCHVHZqwssJa5MARIax//LvWfIfgjIEIQbituA6uTf0=
-----END RSA PRIVATE KEY-----
18 changes: 9 additions & 9 deletions doc/ADAPTER-SUBS.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
## Subscribes to adapter states

There is a functionality to automatically inform adapters, that other instances want to have their states.
It is required for adapters that have limited read/write bandwidth and must read only states that a really
now required (e.g. user selected some view in vis).

Let's say, that the adapter, that can deliver states is PUBLISHER (PUB) and the adapter, who wants to have
PUB's states is SUBSCRIBER (SUB).

## Subscribes to adapter states

There is a functionality to automatically inform adapters, that other instances want to have their states.
It is required for adapters that have limited read/write bandwidth and must read only states that a really
now required (e.g. user selected some view in vis).

Let's say, that the adapter, that can deliver states is PUBLISHER (PUB) and the adapter, who wants to have
PUB's states is SUBSCRIBER (SUB).

There are three functions in states to control subscribes
50 changes: 25 additions & 25 deletions doc/LOGGING.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
## Log transporter
There is a special type of adapters, that consume logs. Normally all adapters
write their messages into the log file with logger.
But some adapters must to show logs or to store them something else.

To create such a type of adapter it must have **logTransport** flag in common structure.

If such a flag is present, the adapter.js creates automatically the special state for it - "system.adapter.adapterName.X.logging".
This variable must be set by logTransport adapter to true, when this adapter wants to receive logs.

"system.adapter.adapterName.X.logging" is fifo queue of redis type list.

Other adapters monitor all variables "*.logging" and write into according lists the log messages.
The list is limited by 1000 messages (by default).

The logTransport instance receives the event "log" with message.

To control "system.adapter.adapterName.X.logging" state the adapter must use *requireLog* function.
E.g. ```adapter.requireLog(true);``` to enable receiving of logs.

![Illustration](logging.png)

The functionality is implemented in *adapter.js* and the developer should just set the common flag *logTransport*
and call *requireLog*.

## Log transporter
There is a special type of adapters, that consume logs. Normally all adapters
write their messages into the log file with logger.
But some adapters must to show logs or to store them something else.

To create such a type of adapter it must have **logTransport** flag in common structure.

If such a flag is present, the adapter.js creates automatically the special state for it - "system.adapter.adapterName.X.logging".
This variable must be set by logTransport adapter to true, when this adapter wants to receive logs.

"system.adapter.adapterName.X.logging" is fifo queue of redis type list.

Other adapters monitor all variables "*.logging" and write into according lists the log messages.
The list is limited by 1000 messages (by default).

The logTransport instance receives the event "log" with message.

To control "system.adapter.adapterName.X.logging" state the adapter must use *requireLog* function.
E.g. ```adapter.requireLog(true);``` to enable receiving of logs.

![Illustration](logging.png)

The functionality is implemented in *adapter.js* and the developer should just set the common flag *logTransport*
and call *requireLog*.

The functionality for non-logTransport adapters is implemented in *adapter.js* and the developer must not care about it.
Loading

0 comments on commit f8ada01

Please sign in to comment.