From 54ceb4a7a213805811c92583d519dce4d4ef6e3f Mon Sep 17 00:00:00 2001 From: Ulas Kozat Date: Thu, 9 Jun 2016 16:43:16 -0700 Subject: files pushed to the client are written to files under directories named after udid Change-Id: I28b5dd6ce3bcc9592108ffecbd325b4290ddeddf Signed-off-by: Ulas Kozat --- DominoServer.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'DominoServer.py') diff --git a/DominoServer.py b/DominoServer.py index cebdc78..98a67e3 100755 --- a/DominoServer.py +++ b/DominoServer.py @@ -237,28 +237,35 @@ class CommunicationHandler: if exception.errno == errno.EEXIST: logging.debug('ERRNO %d; %s exists. Creating: %s', exception.errno, TOSCADIR, TOSCADIR+TOSCA_DEFAULT_FNAME) else: - logging.error('Error occurred in creating %s. Err no: %d', exception.errno) + logging.error('IGNORING error occurred in creating %s. Err no: %d', exception.errno) #Risking a race condition if another process is attempting to write to same file -# f = open(TOSCADIR+TOSCA_DEFAULT_FNAME, 'w') -# for item in pub_msg.template: -# print>>f, item -# f.close() try: miscutil.write_templatefile(TOSCADIR+TOSCA_DEFAULT_FNAME , pub_msg.template) except: #Some sort of race condition should have occured that prevented the write operation #treat as failure + logging.error('FAILED to write the published file: %s', sys.exc_info()[0]) pub_r = PublishResponseMessage() pub_r.domino_udid = SERVER_UDID pub_r.seq_no = self.seqno - pub_r.responseCode = FAILURE + pub_r.responseCode = FAILED self.seqno = self.seqno + 1 return pub_r # Load tosca object from file into memory - tosca = ToscaTemplate( TOSCADIR+TOSCA_DEFAULT_FNAME ) - + try: + tosca = ToscaTemplate( TOSCADIR+TOSCA_DEFAULT_FNAME ) + except: + logging.error('Tosca Parser error: %s', sys.exc_info()[0]) + #tosca file could not be read + pub_r = PublishResponseMessage() + pub_r.domino_udid = SERVER_UDID + pub_r.seq_no = self.seqno + pub_r.responseCode = FAILED + self.seqno = self.seqno + 1 + return pub_r + # Extract Labels node_labels = label.extract_labels( tosca ) logging.debug('Node Labels: %s', node_labels) -- cgit 1.2.3-korg