From: adash <adash>
Date: Wed, 1 Nov 2006 19:03:15 +0000 (+0000)
Subject: Buggy code with log object failure , TO DO: fix it
X-Git-Tag: preEdgeChange~789
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=bab7ee04d287a854e5217e6bd3bb63c696bfc0bc;p=IRC.git

Buggy code with log object failure , TO DO: fix it
---

diff --git a/Robust/src/Tests/Logger.java b/Robust/src/Tests/Logger.java
index 9e85f5bf..25eda4ad 100644
--- a/Robust/src/Tests/Logger.java
+++ b/Robust/src/Tests/Logger.java
@@ -1,24 +1,31 @@
 public class Logger extends FileOutputStream {
 	//Logging flag
-	flag LogPending;
+	flag Initialize;
 
 	//Constructor
 	public Logger(){
+	        System.printString(" Log Object Created\n");
 		FileOutputStreamOpen("./Tests/htmlfiles/request.log");
 	}
-
+/*
 	public void logrequest(String filename){
 		String request = new String("\nNew Request received: ");
 		write(request.getBytes());
 		write(filename.getBytes());
 		flush();
+		close();
 	}
 
 	public void logrequest(){
 		String request = new String("\nNew Request received: ");
+		write(request.getBytes());
 		flush();
+		closerequest();
+	}
+*/
+	public void logtesting(){
+		System.printString(" testing log object\n");
 	}
-
 	public void closerequest() {
 		close();	
  	}
diff --git a/Robust/src/Tests/WebServerExample.java b/Robust/src/Tests/WebServerExample.java
index 6d223a21..6967e847 100644
--- a/Robust/src/Tests/WebServerExample.java
+++ b/Robust/src/Tests/WebServerExample.java
@@ -6,7 +6,7 @@ task Startup(StartupObject s {initialstate}) {
 	System.printString("W> Starting\n");
 	ServerSocket ss = new ServerSocket(9000);
 	System.printString("W> Creating ServerSocket\n");
-	Logger log = new Logger() {!LogPending};
+	Logger log = new Logger() {Initialize};
 	taskexit(s {!initialstate}); /* Turns initial state flag off, so this task won't refire */
 }
 
@@ -22,9 +22,10 @@ task AcceptConnection(ServerSocket ss{SocketPending}) {
 task ProcessRequest(WebServerSocket web{IOPending}) {
 	System.printString("W> Inside ProcessRequest... \n");
 	web.clientrequest();
-	taskexit(web {WritePending});
+	taskexit(web {WritePending, LogPending});
 }
 
+/* Do the WriteIO on server socket and send the requested file to Client*/
 task SendFile(WebServerSocket web{WritePending}) {
 	System.printString("W> Inside SendFile ... \n");
 	web.sendfile();
@@ -32,6 +33,12 @@ task SendFile(WebServerSocket web{WritePending}) {
 	taskexit(web {!WritePending});
 }
 
-task LogFile( Logger log {LogPending}){
-	log.logrequest();
+/* Log the Client request*/
+task LogRequest(WebServerSocket web{LogPending}, Logger log{Initialize}) {
+//task LogRequest(Logger log{Initialize}) {
+//	System.printString("L > Inside logrequest");
+//	log.logrequest();
+	log.logtesting();
+	taskexit(web {!LogPending});
+//	taskexit(log {!Initialize});
 }
diff --git a/Robust/src/Tests/WebServerSocket.java b/Robust/src/Tests/WebServerSocket.java
index 416ae280..02d3d029 100644
--- a/Robust/src/Tests/WebServerSocket.java
+++ b/Robust/src/Tests/WebServerSocket.java
@@ -1,6 +1,6 @@
 public class WebServerSocket extends Socket {
 	// Websocket flag
-	flag ReadPending;
+	flag LogPending;
 	flag WritePending;
 	String filename;
 	
@@ -54,7 +54,6 @@ public class WebServerSocket extends Socket {
 	//Discover what the client wants and handle their request	
 	public int clientrequest(){
 		byte b1[] = new byte[1024];
-		//while(read(b1)<0);
 		read(b1);
 		String clientreq = new String(b1);
 		int index = clientreq.indexOf('/');