Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
tbaltrushaitis committed Oct 24, 2018
2 parents de60304 + d0e25e8 commit 8b33659
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 24 deletions.
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ Just `clone` and `make`:
then `start` as service:

```shell
$ REPO="cmdb-rtm" \
&& cd ${REPO} \
&& npm start ;
$ npm start
```

- [x] It might looks like:
Expand Down
4 changes: 2 additions & 2 deletions bin/Utils.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include ./bin/.bash_colors
.PHONY: state

state:
@ echo "${BCyan}-------------------------------------------------------${NC}";
@ echo ${BCyan}---------------------------------------------------------${NC};
@ echo ${BYellow}ENVIRONMENT VARS:${NC};
@ echo ${BCyan}APPLICATION:${NC};
@ echo "\t DT \t\t = ${DT}";
Expand All @@ -29,7 +29,7 @@ state:
@ echo "\t DIR_BUILD \t = ${DIR_BUILD}";
@ echo "\t DIR_DIST \t = ${DIR_DIST}";
@ echo "\t DIR_WEB \t = ${DIR_WEB}";
@ echo "${BCyan}-------------------------------------------------------${NC}";
@ echo ${BCyan}---------------------------------------------------------${NC};

## ------------------------------------------------------------------------ ##
## Lists all targets defined in this makefile ##
Expand Down
30 changes: 14 additions & 16 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,10 @@
{ "name": "cmdb-rtm"
, "description": "CMDB - Real Time Task Progress Monitoring"
, "description": "CMDB - Real Time Tasks Progress Monitoring"
, "main": "server.js"
, "moduleType": [
"amd"
, "globals"
]
, "keywords": [
"rtm"
, "data visualization"
, "real time hosting monitoring"
, "real time monitoring"
, "real time hosting"
, "real time charts"
, "real time graphs"
, "real time graphics"
, "real time visalization"
]
, "authors": [
"[email protected]"
]
Expand All @@ -35,7 +24,7 @@
"admin-lte": "~2.3.2"
, "animate.css": "~3.7.0"
, "backbone": "~1.3.3"
, "bootstrap": "~3.3.7"
, "bootstrap": "~4.1.3"
, "font-awesome": "~4.7.0"
, "ionicons": "~4.4.6"
, "jquery": "~3.3.1"
Expand All @@ -49,8 +38,17 @@
, "use-amd": "~0.4.0"
, "wdt-loading": "~0.1.0"
}
, "dependenciesDisabled": {
"underscore": "~1.8.3"
}
, "devDependencies": {}
, "dependenciesDisabled": {}
, "keywords": [
"rtm"
, "data visualization"
, "real time hosting monitoring"
, "real time monitoring"
, "real time hosting"
, "real time charts"
, "real time graphs"
, "real time graphics"
, "real time visalization"
]
}
15 changes: 15 additions & 0 deletions config/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
; cli configs
user-agent = "npm/{npm-version} node/{node-version} {platform} {arch}"
long = true

; default values
color = always
fetch-retries = 1
fetch-retry-maxtimeout = 5000
fetch-retry-mintimeout = 1000
init-author-email = "[email protected]"
init-author-name = "Baltrushaitis Tomas"
init-author-url = "https://github.com/tbaltrushaitis"
init-license = "MIT"
init-version = "1.0.0"
spin = always
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ "name": "cmdb-rtm"
, "version": "0.0.2"
, "title": "CMDB :: Real Time Visualization"
, "description": "CMDB - Real Time Task Progress Monitoring"
, "description": "CMDB - Real Time Tasks Progress Monitoring"
, "readmeFilename": "README.md"
, "homepage": "http://cmdb-rtm.gsm-center.com.ua"
, "author": {
Expand Down Expand Up @@ -29,6 +29,8 @@
, "scripts": {
"start": "node app/server.js"
, "build": "gulp build"
, "preinstall": ""
, "postinstall": ""
}
, "repository": {
"type": "git"
Expand All @@ -54,7 +56,7 @@
, "uuid": "^3.3.2"
}
, "devDependencies": {
"autoprefixer": "^9.2.1"
"autoprefixer": "^9.3.1"
, "bower": "^1.8.4"
}
, "dependenciesDeprecated": {
Expand Down
2 changes: 1 addition & 1 deletion src/app/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ let connections = {}
, spawnTime = Math.floor(Math.random() * 4000) + 1500
;

console.log(`[${new Date().toISOString()}] [${utin(process.memoryUsage().rss)}] spawnTime: [${utin(spawnTime)}]`);
console.log(`[${new Date().toISOString()}] [RAM:${utin(process.memoryUsage().rss)}] spawnTime: [${utin(spawnTime)}]`);

const app = express();
app.set('port', Config.get('app:port') || process.env.PORT || 8084);
Expand Down

0 comments on commit 8b33659

Please sign in to comment.