Fix paths and dockerfile

Wesnydy Ribeiro
1 parent 91a4154a
Showing 3 changed files with 18 additions and 2 deletions Show diff stats
Dockerfile
core/processManager.py
translate-api/app.js
@@ -23,7 +23,7 @@ RUN apt-get install -y python-setuptools
 RUN easy_install pip
  
 #Install express.js
-RUN npm install -g express-generator
+#RUN npm install -g express-generator
  
 #Install RabbitMQ
 RUN echo 'deb http://www.rabbitmq.com/debian/ testing main' | sudo tee /etc/apt/sources.list.d/rabbitmq.list
@@ -66,9 +66,11 @@ RUN mkdir -p ./storage/libras
 #Copy workers to container
 COPY ./core/translator.py /root/translator.py
 COPY ./core/renderer.py /root/renderer.py
+COPY ./core/indexer.py /root/indexer.py
 COPY ./core/PikaManager.py /root/PikaManager.py
 COPY ./core/processManager.py /root/processManager.py
 COPY ./core/logger.py /root/logger.py
+COPY ./core/Trie.py /root/Trie.py
  
 COPY ./fonts/ /root/fonts/
  
@@ -34,6 +34,17 @@ def spawnTranslator():
 			print "An error occured, running again..."
 	return None
  
+def spawnIndexer():
+        while KEEP_RUNNING:
+                proc = subprocess.Popen(["/root/indexer.py"], shell=True, stdout=subprocess.PIPE)
+                print("Process INDEXER PID: " + str(proc.pid))
+                try:
+                        stdoutdata, stderrdata = proc.communicate()
+                except:
+                        print "An error occured, running again..."
+        return None
+
+
 if __name__ == "__main__":
 	signal.signal(signal.SIGINT, signalHandler)
  
@@ -42,3 +53,6 @@ if __name__ == &quot;__main__&quot;:
  
 	t2 = Thread(target=spawnRenderer, args=())
 	t2.start()
+
+        t3 = Thread(target=spawnIndexer, args=())
+        t3.start()
@@ -32,7 +32,7 @@ app.use(bodyParser.urlencoded({ extended: true }));
 /**
  * Public directory.
  */
-app.use('/video', express.static(process.env.settings.contentsPath));
+app.use('/video', express.static(settings.contentsPath));
  
 /**
  * Allow cross origin requests.
...	...	@@ -23,7 +23,7 @@ RUN apt-get install -y python-setuptools
23	23	RUN easy_install pip
24	24
25	25	#Install express.js
26		-RUN npm install -g express-generator
	26	+#RUN npm install -g express-generator
27	27
28	28	#Install RabbitMQ
29	29	RUN echo 'deb http://www.rabbitmq.com/debian/ testing main' \| sudo tee /etc/apt/sources.list.d/rabbitmq.list
...	...	@@ -66,9 +66,11 @@ RUN mkdir -p ./storage/libras
66	66	#Copy workers to container
67	67	COPY ./core/translator.py /root/translator.py
68	68	COPY ./core/renderer.py /root/renderer.py
	69	+COPY ./core/indexer.py /root/indexer.py
69	70	COPY ./core/PikaManager.py /root/PikaManager.py
70	71	COPY ./core/processManager.py /root/processManager.py
71	72	COPY ./core/logger.py /root/logger.py
	73	+COPY ./core/Trie.py /root/Trie.py
72	74
73	75	COPY ./fonts/ /root/fonts/
74	76
...	...
...	...	@@ -34,6 +34,17 @@ def spawnTranslator():
34	34	print "An error occured, running again..."
35	35	return None
36	36
	37	+def spawnIndexer():
	38	+ while KEEP_RUNNING:
	39	+ proc = subprocess.Popen(["/root/indexer.py"], shell=True, stdout=subprocess.PIPE)
	40	+ print("Process INDEXER PID: " + str(proc.pid))
	41	+ try:
	42	+ stdoutdata, stderrdata = proc.communicate()
	43	+ except:
	44	+ print "An error occured, running again..."
	45	+ return None
	46	+
	47	+
37	48	if __name__ == "__main__":
38	49	signal.signal(signal.SIGINT, signalHandler)
39	50
...	...	@@ -42,3 +53,6 @@ if __name__ == "__main__":
42	53
43	54	t2 = Thread(target=spawnRenderer, args=())
44	55	t2.start()
	56	+
	57	+ t3 = Thread(target=spawnIndexer, args=())
	58	+ t3.start()
...	...
...	...	@@ -32,7 +32,7 @@ app.use(bodyParser.urlencoded({ extended: true }));
32	32	/**
33	33	* Public directory.
34	34	*/
35		-app.use('/video', express.static(process.env.settings.contentsPath));
	35	+app.use('/video', express.static(settings.contentsPath));
36	36
37	37	/**
38	38	* Allow cross origin requests.
...	...