From 0a485fa8b1adb481471fe49dac94fc5660043551 Mon Sep 17 00:00:00 2001
From: juanvallejo <juan.vallejo.12@cnu.edu>
Date: Sun, 28 Feb 2016 08:41:45 -0500
Subject: [PATCH] revert lights update

---
 client.py |  6 +-----
 server.py | 50 ++++++++++++++++++++++++--------------------------
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/client.py b/client.py
index c533ee3..2cfc5ae 100644
--- a/client.py
+++ b/client.py
@@ -14,11 +14,7 @@ def __init__(self, server):
 		self.gamecontroller = None
 		self.current_state = None
 
-		try:
-			self.lights = visuals.Lights()
-		except Exception:
-			print "self lights equals None"
-			self.lights = None
+		self.lights = visuals.Lights()
 
 	def signal_handler(self, signal, frame):
 		self.lights.set_lights_off()
diff --git a/server.py b/server.py
index a3e46f2..441fe92 100644
--- a/server.py
+++ b/server.py
@@ -21,10 +21,7 @@ def __init__(self, host, port, gamecontroller):
 
 		self.gamecontroller = gamecontroller
 
-		try:	
-			self.lights = visuals.Lights()
-		except Exception:
-			self.lights = None
+		self.lights = visuals.Lights()
 
 		self.subsection = None
 
@@ -76,28 +73,29 @@ def update_lights(self):
 		# if p not active replace with own, if active, keep trying
 		#self.lights.update(self.gamecontroller.get_partial_grid())
 		
-		if self.lights == None:
-			return
-
-		try:
-			pid_valid = False
-			f = open("/tmp/fallback.pid", "w+")
-			pid = f.readline()
-
-			if pid != "" and pid != str(os.getpid()) and self.process_exists(pid):
-				pid_valid = True
-
-			if pid_valid:
-				f.close()
-				return
-			else:
-				f.seek(0)
-				f.write(str(os.getpid()))
-				f.close()
-				self.lights.update(self.gamecontroller.get_partial_grid())
-
-		except IOError as err:
-			print ("err")
+		#if self.lights == None:
+		#	return
+
+		self.lights.update(self.gamecontroller.get_partial_grid())
+		#try:
+		#	pid_valid = False
+		#	f = open("/tmp/fallback.pid", "w+")
+		#	pid = f.readline()
+
+		#	if pid != "" and pid != str(os.getpid()) and self.process_exists(pid):
+		#		pid_valid = True
+
+		#	if pid_valid:
+		#		f.close()
+		#		return
+		#	else:
+		#		f.seek(0)
+		#		f.write(str(os.getpid()))
+		#		f.close()
+		#		self.lights.update(self.gamecontroller.get_partial_grid())
+
+		#except IOError as err:
+		#	print ("err")
 
 def main():
 	server = Server('', 8000)