Download as
Browse Code »

Commit 1f7d950987b3eb85ea05a3444f252500b8ef9867

Authored by André Araújo
1 parent 3a712bc9
Exists in master

Corrige instalação da API

Showing 3 changed files with 59 additions and 86 deletions   Show diff stats
Makefile
  Diff comments   View file @1f7d950
1   -API = git@git.lavid.ufpb.br:wikilibras-api
2   -BLUE = \33[34;5m
3   -DONE = [$(GREEN)Finalizado$(NONE)]
4   -FAIL = [$(RED)Falhou$(NONE)] Codigo: $$?
5   -GREEN = \33[32;5m
6   -MAIN = libras.py
7   -MODULE = wikilibras-api
8   -NONE = \33[m
9   -RED = \33[31;5m
10   -WHITE = \33[37;5m
  1 +LOG=server.log
  2 +SERVER=server.js
  3 +
  4 +.PHONY: help install list run start stop
  5 +
  6 +install: .update .blender .nodejs .npm .mongodb
  7 + @echo "\33[31;5mO computador deve ser reiniciado para concluir o processo\33[0m"
  8 +
  9 +.update:
  10 + @sudo apt-get update
  11 +
  12 +.blender:
  13 + @sudo apt-get -y install blender
  14 +
  15 +.nodejs:
  16 + @sudo apt-get -y install nodejs
  17 + @sudo ln -sf "/usr/bin/nodejs" "/usr/bin/node"
  18 +
  19 +.npm:
  20 + @sudo apt-get update
  21 + @sudo apt-get -y install gcc make build-essential npm
  22 + @sudo rm -rf "./node_modules"
  23 + @sudo ln -sf "$$HOME" "wikilibras_server"
  24 + @sudo npm cache clean
  25 + @sudo npm install -g forever node-gyp
  26 + @sudo npm link forever node-gyp
  27 + @sudo npm install
  28 +
  29 +.mongodb:
  30 + @sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10
  31 + @echo "deb http://repo.mongodb.org/apt/ubuntu "$$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | sudo tee "/etc/apt/sources.list.d/mongodb-org-3.0.list"
  32 + @sudo apt-get update
  33 + @sudo apt-get install -y mongodb-org
  34 + @sudo rm "/etc/apt/sources.list.d/mongodb-org-3.0.list"
  35 +
  36 +help:
  37 + @echo ""
  38 + @echo " \33[33;5m Apenas uma instancia da API deve ser executada\33[0m"
  39 + @echo ""
  40 + @echo " \33[32;5m help \33[0m \33[34;5m exibe essa ajuda \33[0m"
  41 + @echo " \33[32;5m install \33[0m \33[34;5m instala todas as dependencias da API \33[0m"
  42 + @echo " \33[32;5m list \33[0m \33[34;5m lista a API se estiver ativa em background \33[0m"
  43 + @echo " \33[32;5m run \33[0m \33[34;5m conecta o servidor js ao MongoDB para testes \33[0m"
  44 + @echo " \33[32;5m start \33[0m \33[34;5m inicia uma instancia da API em background \33[0m"
  45 + @echo " \33[32;5m stop \33[0m \33[34;5m finaliza a API instanciada no background \33[0m"
  46 + @echo ""
11 47  
12   -__default__: install
13   -
14   -git-clone:
15   - @input="";\
16   - while [ "$$input" != "s" ] && [ "$$input" != "n" ];\
17   - do\
18   - echo -n "$(GREEN)Clonar $(BLUE)$(API)$(GREEN)?$(NONE) (s/n): ";\
19   - read input;\
20   - input="`echo $$input | tr [:upper:] [:lower:]`";\
21   - done;\
22   - if [ "$$input" = "s" ];\
23   - then\
24   - git clone $(API);\
25   - else\
26   - exit 0;\
27   - fi\
28   - && echo "$(DONE)" || { echo "$(FAIL)"; exit $$?; }
29   -
30   -mongodb:
31   - @sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10;\
32   - echo "deb http://repo.mongodb.org/apt/ubuntu "$$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.0.list;\
33   - sudo apt-get -qq update;\
34   - sudo apt-get install -y mongodb-org;\
35   - sudo rm -rf /etc/apt/sources.list.d/mongodb-org*;\
36   - sudo apt-get -qq update;\
37   - #sudo service mongod stop;\
38   - #sudo service mongod start;\
39   - #sudo service mongod restart;\
40   -
41   -install: mongodb
42   - @input="";\
43   - while [ "$$input" != "s" ] && [ "$$input" != "n" ];\
44   - do\
45   - echo -n "$(GREEN)Instalar o modulo Forever?$(NONE) (s/n): ";\
46   - read input;\
47   - input="`echo $$input | tr [:upper:] [:lower:]`";\
48   - done;\
49   - if [ "$$input" = "s" ];\
50   - then\
51   - sudo echo -n;\
52   - echo "$(BLUE)Aguarde...$(NONE)";\
53   - sudo apt-get -qq update;\
54   - sudo apt-get install -y npm nodejs;\
55   - sudo ln -sf /usr/bin/nodejs /usr/bin/node;\
56   - sudo rm -rf ./node_modules;\
57   - sudo npm cache clean;\
58   - ln -sf $$HOME wikilibras_server;\
59   - sudo npm install -g forever;\
60   - sudo chmod 777 -R ./;\
61   - else\
62   - exit 0;\
63   - fi\
64   - && echo "$(DONE)" || { echo "$(FAIL)"; exit $$?; }
65   -
66   -sym_link:
67   - @ln -sf $$HOME ./wikilibras_server\
68   - && echo "$(DONE)" || { echo "$(FAIL)"; exit $$?; }
69   -
70   -node:
71   - @node server.js || { echo "$(FAIL)"; exit $$?; }
  48 +list:
  49 + @forever list
72 50  
73 51 run:
74   - @forever start server.js || { echo "$(FAIL)"; exit $$?; }
  52 + @nodejs $(SERVER)
75 53  
76   -stop:
77   - @forever stop server.js || { echo "$(FAIL)"; exit $$?; }
  54 +start:
  55 + @forever start --spinSleepTime 1000 --minUptime 1000 -a -l $(LOG) -o $(LOG) -e $(LOG) $(SERVER)
78 56  
79   -list:
80   - @forever list
81   - @exit 0;\
82   - port=`grep -w 'port' -f ./helpers/properties.js`;\
83   - while(true);\
84   - do\
85   - echo "$(GREEN)Host: `hostname -i | awk '{print $1}'`$(NONE)";\
86   - echo "$(GREEN)Port: $$port$(NONE)";\
87   - echo "$(RED)Stop: CTRL + C$(NONE)"\
88   - && forever list || { echo "$(FAIL)"; exit $$?; };\
89   - done
  57 +stop:
  58 + @forever stop $(SERVER)
... ...
package.json
  Diff comments   View file @1f7d950
... ... @@ -9,11 +9,12 @@
9 9 },
10 10 "author": "LAViD",
11 11 "license": "MIT",
  12 + "private": true,
12 13 "dependencies": {
13 14 "body-parser": "^1.9.2",
14 15 "express": "~3.5.1",
15 16 "mkdirp": "^0.5.0",
16   - "mongoose": "^3.8.16",
  17 + "mongoose": "~3.8.x",
17 18 "node-uuid": "^1.4.1",
18 19 "python-shell": "0.0.3"
19 20 }
... ...
server.js
  Diff comments   View file @1f7d950
... ... @@ -24,7 +24,10 @@ var Sign = require('./db/schemas/sinal').init(mongoose);
24 24 var API = require('./db/api');
25 25  
26 26 app.use(express.static(path.join(__dirname, '/public')));
27   -app.use(express.bodyParser({ keepExtensions: true }));
  27 +
  28 +// deprecated: app.use(express.bodyParser({ keepExtensions: true }));
  29 +app.use(express.urlencoded({ keepExtensions: true }))
  30 +app.use(express.json())
28 31  
29 32 app.get('/', function(req, res) {
30 33 res.send(200, { 'status': 'server is running!' });
... ...