Skip to content

Commit f8ada01

Browse files
GermanBluefoxGermanBluefox
committed
(bluefox) change CRLF
1 parent fb324bd commit f8ada01

37 files changed

+13022
-13022
lines changed

‎.gitignore‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
.idea
2-
node_modules
3-
/conf/iobroker.json
4-
/log/iobroker.log
5-
/lib/ioBroker.pid
6-
/adapter/email
7-
/adapter/sonos
8-
/adapter/admin
9-
/data
10-
/npm-debug.log
11-
/tmp
12-
/log
13-
pids.txt
14-
backups
15-
cache
16-
/img
17-
/test/coverage
18-
/test/report
19-
/conf/sources-dist.json
20-
/package-lock.json
21-
/.npmrc
22-
/lib/objects/objectsInRedis.js
1+
.idea
2+
node_modules
3+
/conf/iobroker.json
4+
/log/iobroker.log
5+
/lib/ioBroker.pid
6+
/adapter/email
7+
/adapter/sonos
8+
/adapter/admin
9+
/data
10+
/npm-debug.log
11+
/tmp
12+
/log
13+
pids.txt
14+
backups
15+
cache
16+
/img
17+
/test/coverage
18+
/test/report
19+
/conf/sources-dist.json
20+
/package-lock.json
21+
/.npmrc
22+
/lib/objects/objectsInRedis.js

‎.npmignore‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
Gruntfile.js
2-
tasks
3-
data
4-
conf/iobroker.json
5-
node_modules
6-
.idea
7-
.git
8-
*.md
9-
tmp
10-
log/*
11-
.travis.yml
12-
istanbul.yml
13-
lib/*.pid
14-
backups
15-
cache
16-
test
17-
pids.txt
18-
doc
19-
appveyor.yml
1+
Gruntfile.js
2+
tasks
3+
data
4+
conf/iobroker.json
5+
node_modules
6+
.idea
7+
.git
8+
*.md
9+
tmp
10+
log/*
11+
.travis.yml
12+
istanbul.yml
13+
lib/*.pid
14+
backups
15+
cache
16+
test
17+
pids.txt
18+
doc
19+
appveyor.yml

‎LICENSE‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
The MIT License (MIT)
2-
3-
Copyright (c) 2014-2019 bluefox<[email protected]>,
4-
Copyright (c) 2014 hobbyquaker
5-
6-
Permission is hereby granted, free of charge, to any person obtaining a copy
7-
of this software and associated documentation files (the "Software"), to deal
8-
in the Software without restriction, including without limitation the rights
9-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10-
copies of the Software, and to permit persons to whom the Software is
11-
furnished to do so, subject to the following conditions:
12-
13-
The above copyright notice and this permission notice shall be included in
14-
all copies or substantial portions of the Software.
15-
16-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22-
THE SOFTWARE.
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2014-2019 bluefox<[email protected]>,
4+
Copyright (c) 2014 hobbyquaker
5+
6+
Permission is hereby granted, free of charge, to any person obtaining a copy
7+
of this software and associated documentation files (the "Software"), to deal
8+
in the Software without restriction, including without limitation the rights
9+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10+
copies of the Software, and to permit persons to whom the Software is
11+
furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in
14+
all copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
THE SOFTWARE.

‎conf/cert.crt‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
-----BEGIN CERTIFICATE-----
2-
MIIDFjCCAf4CCQC79K8N/kVROTANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJE
3-
RTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UECgwIaW9Ccm9rZXIxFjAUBgNV
4-
BAMMDWlvQnJva2VyIFVzZXIwHhcNMTgwOTA5MTg1MDExWhcNMjAwOTA4MTg1MDEx
5-
WjBNMQswCQYDVQQGEwJERTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UECgwI
6-
aW9Ccm9rZXIxFjAUBgNVBAMMDWlvQnJva2VyIFVzZXIwggEiMA0GCSqGSIb3DQEB
7-
AQUAA4IBDwAwggEKAoIBAQCngs/CJrOHgNfC6KA/ZiqTAP6E4g7jQQfQ2uSEZSlt
8-
Ilo8ILpSz0nzyg+bXf0N80JJQs8bebHtSJsoC7n+MYORBQN5nVHNk/RtVcaVXHrw
9-
A2RRAecvnv8bz+zha3D1bLCxnxqeScmXLA8cf2JtDCB9qrpIpJs+f0kJgilNlIDm
10-
g/rek9BcD8FDUnURZ07Q3nGWdE1OeesuBYp7g/zevJA/IsKJkhVZA3zHeOWO+LIl
11-
JCmLq1Uz4BfvkTsMWo5mftNYwTp57vtgabMoL2Z7T0clGWMt0kDPg6UUvP2n05XO
12-
uMXmpFEuqN/Z9wTE+nrLVDRRhhKw8l06F0Nqe7rBo9rrAgMBAAEwDQYJKoZIhvcN
13-
AQELBQADggEBAHJ4hl5Ldczy6dHo6pyugatQrnYSTit5zlYSotzOI3n3QFiWmjUP
14-
ekm3lCBryb76Ua7USLR6ay+zrHKQgRx/S9FlHLTZNQytB9F4jJBeDNmmI3JbtZz1
15-
dMPkbwsYONzG5Pc5iPBOLbWYWjPZOGNeURQB31X8//TvPBsn8JdzRYT+KaJwNWbj
16-
1o0Zdj2NB7Ws5JixkMCbWOMCqr5xQ+VonordVg2Sssh2vU/7qhdFsd560julXjLK
17-
ueX1tQmIAf34CVy41M9V42wuZ9J7C3+yFA6H5TY9TmGT7hkRxk2YN0twD2um1ZkT
18-
4KSa87M3J/aQwP4XECsQLXwDfORXrc3adRc=
1+
-----BEGIN CERTIFICATE-----
2+
MIIDFjCCAf4CCQC79K8N/kVROTANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQGEwJE
3+
RTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UECgwIaW9Ccm9rZXIxFjAUBgNV
4+
BAMMDWlvQnJva2VyIFVzZXIwHhcNMTgwOTA5MTg1MDExWhcNMjAwOTA4MTg1MDEx
5+
WjBNMQswCQYDVQQGEwJERTETMBEGA1UECAwKU29tZS1TdGF0ZTERMA8GA1UECgwI
6+
aW9Ccm9rZXIxFjAUBgNVBAMMDWlvQnJva2VyIFVzZXIwggEiMA0GCSqGSIb3DQEB
7+
AQUAA4IBDwAwggEKAoIBAQCngs/CJrOHgNfC6KA/ZiqTAP6E4g7jQQfQ2uSEZSlt
8+
Ilo8ILpSz0nzyg+bXf0N80JJQs8bebHtSJsoC7n+MYORBQN5nVHNk/RtVcaVXHrw
9+
A2RRAecvnv8bz+zha3D1bLCxnxqeScmXLA8cf2JtDCB9qrpIpJs+f0kJgilNlIDm
10+
g/rek9BcD8FDUnURZ07Q3nGWdE1OeesuBYp7g/zevJA/IsKJkhVZA3zHeOWO+LIl
11+
JCmLq1Uz4BfvkTsMWo5mftNYwTp57vtgabMoL2Z7T0clGWMt0kDPg6UUvP2n05XO
12+
uMXmpFEuqN/Z9wTE+nrLVDRRhhKw8l06F0Nqe7rBo9rrAgMBAAEwDQYJKoZIhvcN
13+
AQELBQADggEBAHJ4hl5Ldczy6dHo6pyugatQrnYSTit5zlYSotzOI3n3QFiWmjUP
14+
ekm3lCBryb76Ua7USLR6ay+zrHKQgRx/S9FlHLTZNQytB9F4jJBeDNmmI3JbtZz1
15+
dMPkbwsYONzG5Pc5iPBOLbWYWjPZOGNeURQB31X8//TvPBsn8JdzRYT+KaJwNWbj
16+
1o0Zdj2NB7Ws5JixkMCbWOMCqr5xQ+VonordVg2Sssh2vU/7qhdFsd560julXjLK
17+
ueX1tQmIAf34CVy41M9V42wuZ9J7C3+yFA6H5TY9TmGT7hkRxk2YN0twD2um1ZkT
18+
4KSa87M3J/aQwP4XECsQLXwDfORXrc3adRc=
1919
-----END CERTIFICATE-----

‎conf/cert.key‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
-----BEGIN RSA PRIVATE KEY-----
2-
MIIEogIBAAKCAQEAp4LPwiazh4DXwuigP2YqkwD+hOIO40EH0NrkhGUpbSJaPCC6
3-
Us9J88oPm139DfNCSULPG3mx7UibKAu5/jGDkQUDeZ1RzZP0bVXGlVx68ANkUQHn
4-
L57/G8/s4Wtw9WywsZ8anknJlywPHH9ibQwgfaq6SKSbPn9JCYIpTZSA5oP63pPQ
5-
XA/BQ1J1EWdO0N5xlnRNTnnrLgWKe4P83ryQPyLCiZIVWQN8x3jljviyJSQpi6tV
6-
M+AX75E7DFqOZn7TWME6ee77YGmzKC9me09HJRljLdJAz4OlFLz9p9OVzrjF5qRR
7-
Lqjf2fcExPp6y1Q0UYYSsPJdOhdDanu6waPa6wIDAQABAoIBACo8JT4CnAlyRvRx
8-
ytWxYNKn0YSXqsFJyDq0tiFbkFJf8vhuGAyBD1hUfhLiY8d8qh3mpml7CY2WXOh/
9-
7GlW+qE57mJfdBytTVez5NoL80NI16ZFIJE1OYU9q7A6csSunu5p+0AlwppHFZhN
10-
1fdAs4B753QhbLMZTMUE+H0DEG0OOS6zZIXGEguKj84wDEWBPg5332B2uEZd0vJ8
11-
cZqaBuE6/igbx8sNFajUwsdQI74t7+qV1u6bdKDPEpifAd+qqc4BHGuUqiHkKhxU
12-
FQCVNXO7KJLu5TJO3xvdYLJxvxkEvL1dw1yPi1v3Y9fl6AuP4JVoryWCNC6vlQIa
13-
aYyzScECgYEA3Uzg5vp1Z3ucMlFvb3hp+5nqg7hh6uDGhtMsXty3BaOUABQIQE2L
14-
EdyjQT3JJB2nx3yfCDq2DbwvUb7yBsvGsqw7NJ8lH39uBwAvXSYj4PCU2l/NjhI5
15-
Kzxw/YWvNsOyCHB+oJVRksqxMO4DUB/xNSBK4VpEx7MHZ6/PfsvJ+KkCgYEAwcbM
16-
dJxfa2qvVIYXEUUI4w8Zd+dtseRr7Cp9Wxg2eaOlkwDxI3Se4+p8uGT4mgP9T6U8
17-
vPJvNfKgwjQpV9h+2Bid5+mFSwOmpiMxxzMs6r7TisFidR9D4pg2PXykoFEt8K2y
18-
KmWc1UdAYIYRIhhFH/RrJjY/IGO+D+HY27vlT3MCgYBB1t+KmLVZRlNgPQ40UdTm
19-
QBKfgbnQEXO/JRCsYGorSVF8/Hi/+NIJTGVdwa4YCqKiHReLcTw8teI2JeMH1pSV
20-
D9zFeRuoVVc8yfdNdU1zXOBMX/hd7loH3QGYy68nUe2jySRDTmlojNlOv2FI81fm
21-
AGeGyD5yU3c+h/XpuWOrkQKBgBZHdBRoMjRYdMYkEJzksgvhHY2Cp0MPvzTNAdKq
22-
awD7RrsrHY51BxuvRx2wRkD2+nXgyqXyvcSXG9KYSrSV6KeR1P3oBHJGfi+V1lBP
23-
2vc2b34Bk/9hU93GoF3badYg30ZPwi9LtYd0BLvUTj38Sl5NLNCc5g8kSKLs1ZEV
24-
/lxvAoGASbkaJwc51zt8JjYXA4fOOUtP6C/ExI6D5sDtQUdl4Qgzjq5WAZEhMLDI
25-
gVWX3ZYj9nM5p47fRhWnMmijEK9wZb7eLTLc5IV+W5oZdpr2bfnSk+u9rOZB9uMR
26-
kNirnGlIfCHVHZqwssJa5MARIax//LvWfIfgjIEIQbituA6uTf0=
27-
-----END RSA PRIVATE KEY-----
1+
-----BEGIN RSA PRIVATE KEY-----
2+
MIIEogIBAAKCAQEAp4LPwiazh4DXwuigP2YqkwD+hOIO40EH0NrkhGUpbSJaPCC6
3+
Us9J88oPm139DfNCSULPG3mx7UibKAu5/jGDkQUDeZ1RzZP0bVXGlVx68ANkUQHn
4+
L57/G8/s4Wtw9WywsZ8anknJlywPHH9ibQwgfaq6SKSbPn9JCYIpTZSA5oP63pPQ
5+
XA/BQ1J1EWdO0N5xlnRNTnnrLgWKe4P83ryQPyLCiZIVWQN8x3jljviyJSQpi6tV
6+
M+AX75E7DFqOZn7TWME6ee77YGmzKC9me09HJRljLdJAz4OlFLz9p9OVzrjF5qRR
7+
Lqjf2fcExPp6y1Q0UYYSsPJdOhdDanu6waPa6wIDAQABAoIBACo8JT4CnAlyRvRx
8+
ytWxYNKn0YSXqsFJyDq0tiFbkFJf8vhuGAyBD1hUfhLiY8d8qh3mpml7CY2WXOh/
9+
7GlW+qE57mJfdBytTVez5NoL80NI16ZFIJE1OYU9q7A6csSunu5p+0AlwppHFZhN
10+
1fdAs4B753QhbLMZTMUE+H0DEG0OOS6zZIXGEguKj84wDEWBPg5332B2uEZd0vJ8
11+
cZqaBuE6/igbx8sNFajUwsdQI74t7+qV1u6bdKDPEpifAd+qqc4BHGuUqiHkKhxU
12+
FQCVNXO7KJLu5TJO3xvdYLJxvxkEvL1dw1yPi1v3Y9fl6AuP4JVoryWCNC6vlQIa
13+
aYyzScECgYEA3Uzg5vp1Z3ucMlFvb3hp+5nqg7hh6uDGhtMsXty3BaOUABQIQE2L
14+
EdyjQT3JJB2nx3yfCDq2DbwvUb7yBsvGsqw7NJ8lH39uBwAvXSYj4PCU2l/NjhI5
15+
Kzxw/YWvNsOyCHB+oJVRksqxMO4DUB/xNSBK4VpEx7MHZ6/PfsvJ+KkCgYEAwcbM
16+
dJxfa2qvVIYXEUUI4w8Zd+dtseRr7Cp9Wxg2eaOlkwDxI3Se4+p8uGT4mgP9T6U8
17+
vPJvNfKgwjQpV9h+2Bid5+mFSwOmpiMxxzMs6r7TisFidR9D4pg2PXykoFEt8K2y
18+
KmWc1UdAYIYRIhhFH/RrJjY/IGO+D+HY27vlT3MCgYBB1t+KmLVZRlNgPQ40UdTm
19+
QBKfgbnQEXO/JRCsYGorSVF8/Hi/+NIJTGVdwa4YCqKiHReLcTw8teI2JeMH1pSV
20+
D9zFeRuoVVc8yfdNdU1zXOBMX/hd7loH3QGYy68nUe2jySRDTmlojNlOv2FI81fm
21+
AGeGyD5yU3c+h/XpuWOrkQKBgBZHdBRoMjRYdMYkEJzksgvhHY2Cp0MPvzTNAdKq
22+
awD7RrsrHY51BxuvRx2wRkD2+nXgyqXyvcSXG9KYSrSV6KeR1P3oBHJGfi+V1lBP
23+
2vc2b34Bk/9hU93GoF3badYg30ZPwi9LtYd0BLvUTj38Sl5NLNCc5g8kSKLs1ZEV
24+
/lxvAoGASbkaJwc51zt8JjYXA4fOOUtP6C/ExI6D5sDtQUdl4Qgzjq5WAZEhMLDI
25+
gVWX3ZYj9nM5p47fRhWnMmijEK9wZb7eLTLc5IV+W5oZdpr2bfnSk+u9rOZB9uMR
26+
kNirnGlIfCHVHZqwssJa5MARIax//LvWfIfgjIEIQbituA6uTf0=
27+
-----END RSA PRIVATE KEY-----

‎doc/ADAPTER-SUBS.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
## Subscribes to adapter states
2-
3-
There is a functionality to automatically inform adapters, that other instances want to have their states.
4-
It is required for adapters that have limited read/write bandwidth and must read only states that a really
5-
now required (e.g. user selected some view in vis).
6-
7-
Let's say, that the adapter, that can deliver states is PUBLISHER (PUB) and the adapter, who wants to have
8-
PUB's states is SUBSCRIBER (SUB).
9-
1+
## Subscribes to adapter states
2+
3+
There is a functionality to automatically inform adapters, that other instances want to have their states.
4+
It is required for adapters that have limited read/write bandwidth and must read only states that a really
5+
now required (e.g. user selected some view in vis).
6+
7+
Let's say, that the adapter, that can deliver states is PUBLISHER (PUB) and the adapter, who wants to have
8+
PUB's states is SUBSCRIBER (SUB).
9+
1010
There are three functions in states to control subscribes

‎doc/LOGGING.md‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
## Log transporter
2-
There is a special type of adapters, that consume logs. Normally all adapters
3-
write their messages into the log file with logger.
4-
But some adapters must to show logs or to store them something else.
5-
6-
To create such a type of adapter it must have **logTransport** flag in common structure.
7-
8-
If such a flag is present, the adapter.js creates automatically the special state for it - "system.adapter.adapterName.X.logging".
9-
This variable must be set by logTransport adapter to true, when this adapter wants to receive logs.
10-
11-
"system.adapter.adapterName.X.logging" is fifo queue of redis type list.
12-
13-
Other adapters monitor all variables "*.logging" and write into according lists the log messages.
14-
The list is limited by 1000 messages (by default).
15-
16-
The logTransport instance receives the event "log" with message.
17-
18-
To control "system.adapter.adapterName.X.logging" state the adapter must use *requireLog* function.
19-
E.g. ```adapter.requireLog(true);``` to enable receiving of logs.
20-
21-
![Illustration](logging.png)
22-
23-
The functionality is implemented in *adapter.js* and the developer should just set the common flag *logTransport*
24-
and call *requireLog*.
25-
1+
## Log transporter
2+
There is a special type of adapters, that consume logs. Normally all adapters
3+
write their messages into the log file with logger.
4+
But some adapters must to show logs or to store them something else.
5+
6+
To create such a type of adapter it must have **logTransport** flag in common structure.
7+
8+
If such a flag is present, the adapter.js creates automatically the special state for it - "system.adapter.adapterName.X.logging".
9+
This variable must be set by logTransport adapter to true, when this adapter wants to receive logs.
10+
11+
"system.adapter.adapterName.X.logging" is fifo queue of redis type list.
12+
13+
Other adapters monitor all variables "*.logging" and write into according lists the log messages.
14+
The list is limited by 1000 messages (by default).
15+
16+
The logTransport instance receives the event "log" with message.
17+
18+
To control "system.adapter.adapterName.X.logging" state the adapter must use *requireLog* function.
19+
E.g. ```adapter.requireLog(true);``` to enable receiving of logs.
20+
21+
![Illustration](logging.png)
22+
23+
The functionality is implemented in *adapter.js* and the developer should just set the common flag *logTransport*
24+
and call *requireLog*.
25+
2626
The functionality for non-logTransport adapters is implemented in *adapter.js* and the developer must not care about it.

0 commit comments

Comments
 (0)