Skip to content

Commit 7c324d0

Browse files
alexk-blackopsalexk-blackops
alexk-blackops
authored and
alexk-blackops
committed
different fixes
1 parent 76820d1 commit 7c324d0

File tree

11 files changed

+309
-75
lines changed

11 files changed

+309
-75
lines changed

‎LICENSE‎

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

‎README.md‎

Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,33 @@
1-
stackify-log-nodejs
2-
===================
1+
##Stackify Log API for Node.js
32

4-
Stackify Log API for Node.js
3+
Errors and Logs Overview:
4+
5+
http://docs.stackify.com/m/7787/l/189767
6+
7+
Sign Up for a Trial:
8+
9+
http://www.stackify.com/sign-up/
10+
11+
## Usage
12+
13+
14+
## Installation
15+
16+
17+
Note: *We are dependent on the Guava project from Google. We require version 15.0 (or beyond) for the background thread that sends data back to Stackify.*
18+
19+
## License
20+
21+
Copyright 2014 Stackify, LLC.
22+
23+
Licensed under the Apache License, Version 2.0 (the "License");
24+
you may not use this file except in compliance with the License.
25+
You may obtain a copy of the License at
26+
27+
http://www.apache.org/licenses/LICENSE-2.0
28+
29+
Unless required by applicable law or agreed to in writing, software
30+
distributed under the License is distributed on an "AS IS" BASIS,
31+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
32+
See the License for the specific language governing permissions and
33+
limitations under the License.

‎config/config.js‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,19 @@ module.exports = {
44
PORT : 443,
55
IDENTIFY_PATH : '/API/Metrics/IdentifyApp',
66
LOG_SAVE_PATH : '/API/Log/Save',
7-
// possible delay values in millis
8-
DELAY: {
7+
DELAY: { // possible delay values in millis
98
ONE_SECOND_DELAY : 1000,
109
FIVE_SECONDS_DELAY : 5000,
1110
ONE_MINUTE_DELAY : 60000,
1211
FIVE_MINUTES_DELAY : 300000,
1312
},
1413
MSG: {
15-
QUEUE_CAP : 10000, // overall messages cap in the queue
16-
// minimum and maximum batch sizes
17-
MIN_BATCH_SIZE : 10,
18-
MAX_BATCH_SIZE : 100,
19-
// Number of instances of a unique error that are allowed to be sent in one minute
20-
MAX_DUP_ERROR_PER_MINUTE: 5,
21-
},
14+
QUEUE_CAP : 10000, // queue cap
15+
MIN_BATCH_SIZE : 10, // maximum batch size
16+
MAX_BATCH_SIZE : 100, // maximum batch size
17+
MAX_DUP_ERROR_PER_MINUTE: 5, // Number of instances of a unique error that are allowed to be sent in one minute
18+
19+
},
2220
IDENTIFY_DELAY: 300000, // 5 minutes delay if identifyApp call failed
23-
/**
24-
* Cookie value
25-
*/
26-
COOKIE_MASK: 'X-MASKED-X'
21+
COOKIE_MASK: 'X-MASKED-X' // cookie headers and values mask
2722
};

‎index.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
var api = require('./lib/api'), // wrappers for API calls
2-
CONFIG = require('./config/config'), // configuration settings file
3-
error = require('./lib/error'), // error parser module
4-
exc = require('./lib/exception'), // exception handler module
5-
helpers = require('./lib/helpers'), // different helpers functions
6-
logger = require('./lib/logger'), // logging methods module
7-
sender = require('./lib/sender'); // wrapper for http/https requests
1+
var api = require('./lib/api'), // wrappers for API calls
2+
CONFIG = require('./config/config'), // configuration settings file
3+
error = require('./lib/error'), // error parser module
4+
exception = require('./lib/exception'), // exception handler module
5+
helpers = require('./lib/helpers'), // different helpers functions
6+
logger = require('./lib/logger'), // logging methods module
7+
sender = require('./lib/sender'); // wrapper for http/https requests
88

99
module.exports = {
1010
// start sending logs
@@ -19,9 +19,9 @@ module.exports = {
1919
info: logger.methods.info,
2020
warn: logger.methods.warn,
2121
error: logger.methods.error,
22-
22+
2323
push: logger.methods.push,
2424

25-
excHandler: exc.exc,
26-
expressExcHandler: exc.expressExc
25+
exceptionHandler: exception.exceptionHandler,
26+
expressExceptionHandler: exception.expressExceptionHandler
2727
};

‎lib/api.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ var os = require('os'),
99
pkginfo = require('pkginfo')(module, 'name'),
1010

1111
appname = module.exports.name, // name of the app from package.json
12-
last_api_error,
12+
lastApiError,
1313

1414
//getting all the headers for requests
1515
options = function options(path, body, proxy) {
@@ -33,15 +33,16 @@ var os = require('os'),
3333
return result;
3434

3535
};
36-
module.exports.last_api_error = last_api_error;
36+
module.exports.lastApiError = lastApiError;
3737
module.exports.methods = {
3838

3939
identifyApp: function identifyApp(settings) {
4040
var body = {
4141
DeviceName: os.hostname(),
4242
AppName: appname,
4343
ConfiguredAppName: appname,
44-
AppLocaton: process.env.PWD
44+
AppLocaton: process.env.PWD,
45+
ConfiguredEnvName: settings ? settings.env : (process.env.NODE_ENV || null)
4546
},
4647
opt = options(CONFIG.IDENTIFY_PATH, body, settings ? settings.proxy : undefined),
4748
callback = function (data) {
@@ -69,7 +70,7 @@ module.exports.methods = {
6970
if (settings.apiKey && typeof (settings.apiKey) === 'string') {
7071
opt.headers['X-Stackify-Key'] = settings.apiKey;
7172
CONFIG.APPNAME = appname;
72-
CONFIG.ENV = settings.env || null;
73+
CONFIG.ENV = settings.env || process.env.NODE_ENV || null;
7374
send(opt, callback, fail);
7475
} else {
7576
throw new TypeError('You have to pass API key');
@@ -89,7 +90,7 @@ module.exports.methods = {
8990
ServerName: os.hostname(),
9091
AppName: appname,
9192
AppLoc: process.env.PWD,
92-
Logger: 'Node.js Stackify Logger ver. 1.0',
93+
Logger: 'Node.js Stackify v.1.0',
9394
Platform: 'Node.js',
9495
Msgs : messages
9596
},
@@ -101,10 +102,10 @@ module.exports.methods = {
101102

102103
if (code === 401) {
103104
delay = CONFIG.DELAY.FIVE_MINUTES;
104-
last_api_error = new Date().getTime();
105+
lastApiError = new Date().getTime();
105106
} else {
106-
last_api_error = last_api_error || new Date().getTime();
107-
sinceFirstError = new Date().getTime() - last_api_error;
107+
lastApiError = lastApiError || new Date().getTime();
108+
sinceFirstError = new Date().getTime() - lastApiError;
108109
delay = Math.min(Math.max(sinceFirstError, CONFIG.DELAY.ONE_SECOND), CONFIG.DELAY.ONE_MINUTE);
109110
}
110111

0 commit comments

Comments
 (0)