Compare commits

..

8 Commits
2.7.2 ... 2.9.0

Author SHA1 Message Date
Raul Ochoa
e3d5abc9a2 Release 2.9.0 2015-08-06 18:02:09 +02:00
Raul Ochoa
ea7a5da1c1 Merge pull request #324 from CartoDB/memory-stats
Send memory usage stats
2015-08-06 16:12:18 +02:00
Raul Ochoa
2e063cc2d2 Send memory usage stats 2015-08-06 16:06:42 +02:00
Raul Ochoa
decd9077e4 Stubs next version 2015-07-15 11:44:59 +02:00
Raul Ochoa
f6c47bf85e Release 2.8.0 2015-07-15 11:43:54 +02:00
Raul Ochoa
423191c13b Merge pull request #319 from CartoDB/upgrade-windshaft
Upgrades windshaft to 0.48.0
2015-07-15 11:43:09 +02:00
Raul Ochoa
7a5928d957 Upgrades windshaft to 0.48.0 2015-07-15 11:31:26 +02:00
Raul Ochoa
436c334f5a Stubs next version 2015-07-14 16:33:12 +02:00
4 changed files with 44 additions and 21 deletions

16
NEWS.md
View File

@@ -1,5 +1,21 @@
# Changelog
## 2.9.0
Released 2015-08-06
New features:
- Send memory usage stats
## 2.8.0
Released 2015-07-15
Announcements:
- Upgrades windshaft to [0.48.0](https://github.com/CartoDB/Windshaft/releases/tag/0.48.0)
## 2.7.2
Released 2015-07-14

7
app.js
View File

@@ -86,6 +86,13 @@ if (global.statsClient) {
global.statsClient.gauge(keyPrefix + 'unused', status.unused);
global.statsClient.gauge(keyPrefix + 'waiting', status.waiting);
});
setInterval(function() {
var memoryUsage = process.memoryUsage();
Object.keys(memoryUsage).forEach(function(k) {
global.statsClient.gauge('windshaft.memory.' + k, memoryUsage[k]);
});
}, 5000);
}
// Maximum number of connections for one process

38
npm-shrinkwrap.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "windshaft-cartodb",
"version": "2.7.2",
"version": "2.9.0",
"dependencies": {
"cartodb-psql": {
"version": "0.4.0",
@@ -139,14 +139,14 @@
"resolved": "https://registry.npmjs.org/async/-/async-1.3.0.tgz"
},
"mime-types": {
"version": "2.1.2",
"version": "2.1.3",
"from": "mime-types@^2.1.1",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.2.tgz",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.3.tgz",
"dependencies": {
"mime-db": {
"version": "1.14.0",
"from": "mime-db@~1.14.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.14.0.tgz"
"version": "1.15.0",
"from": "mime-db@~1.15.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.15.0.tgz"
}
}
}
@@ -276,9 +276,9 @@
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
"dependencies": {
"bluebird": {
"version": "2.9.32",
"version": "2.9.33",
"from": "bluebird@^2.9.30",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.32.tgz"
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.33.tgz"
},
"chalk": {
"version": "1.1.0",
@@ -485,9 +485,9 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
},
"windshaft": {
"version": "0.47.0",
"from": "windshaft@0.47.0",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.47.0.tgz",
"version": "0.48.0",
"from": "windshaft@0.48.0",
"resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.48.0.tgz",
"dependencies": {
"chronograph": {
"version": "0.1.0",
@@ -2293,8 +2293,8 @@
},
"tilelive-mapnik": {
"version": "0.6.15",
"from": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb",
"resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/cdb",
"from": "https://github.com/CartoDB/tilelive-mapnik/tarball/upgrade-mapnik",
"resolved": "https://github.com/CartoDB/tilelive-mapnik/tarball/upgrade-mapnik",
"dependencies": {
"generic-pool": {
"version": "2.1.1",
@@ -2303,15 +2303,15 @@
},
"mime": {
"version": "1.2.11",
"from": "mime@~1.2.9",
"from": "mime@~1.2.11",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
}
}
},
"mapnik": {
"version": "1.4.15-cdb1",
"from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb1",
"resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb1",
"version": "1.4.15-cdb2",
"from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb2",
"resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb2",
"dependencies": {
"nan": {
"version": "1.2.0",
@@ -2919,8 +2919,8 @@
},
"abaculus": {
"version": "1.1.0",
"from": "https://github.com/CartoDB/abaculus/tarball/cdb",
"resolved": "https://github.com/CartoDB/abaculus/tarball/cdb"
"from": "https://github.com/CartoDB/abaculus/tarball/upgrade-mapnik",
"resolved": "https://github.com/CartoDB/abaculus/tarball/upgrade-mapnik"
},
"sphericalmercator": {
"version": "1.0.2",

View File

@@ -1,7 +1,7 @@
{
"private": true,
"name": "windshaft-cartodb",
"version": "2.7.2",
"version": "2.9.0",
"description": "A map tile server for CartoDB",
"keywords": [
"cartodb"
@@ -24,7 +24,7 @@
"dependencies": {
"underscore" : "~1.6.0",
"dot": "~1.0.2",
"windshaft": "0.47.0",
"windshaft": "0.48.0",
"step": "~0.0.5",
"queue-async": "~1.0.7",
"request": "~2.9.203",