Commit a9a31319 authored by Sophie Wenzel-Teuber's avatar Sophie Wenzel-Teuber
Browse files

Probably cleaned up a merge conflict, not sure

parents cbfb6438 279c2d65
......@@ -3,6 +3,16 @@ if(DEBUG)
add_compile_definitions(DEBUG)
endif(DEBUG)
<<<<<<< HEAD
add_subdirectory(fiphobo)
add_subdirectory(server)
=======
add_executable(
fiphoboserver
server/server.cc
server/static_handler.cc
server/push_request_handler.cc
fiphobo/fiphobo.cc
)
>>>>>>> 279c2d6582bd8d1a3a24f40bde21e5e5e7bfb284
......@@ -79,4 +79,4 @@ public:
private:
std::unique_ptr<proxygen::HTTPMessage> headers;
};
}
\ No newline at end of file
}
......@@ -180,7 +180,7 @@ void FiPhobo::startFIFO()
std::cout << "Phobos_Layer::startFIFO" << std::endl;
#endif
int rc = mkfifo(fifoName.c_str(), 0777);
if(rc)
if(rc < 0)
{
printf("mkfifo returned an error: %s\n", std::strerror(errno));
return;
......@@ -189,7 +189,7 @@ void FiPhobo::startFIFO()
fifo_descriptor = open(fifoName.c_str(), O_RDWR);
if (fifo_descriptor < 0)
{
printf("Could not open file: %s\n", fifoName);
printf("Could not open fifo: %s\n", fifoName);
return;
}
......@@ -197,4 +197,4 @@ void FiPhobo::startFIFO()
std::cout << "End of Phobos_Layer::startFIFO" << std::endl;
#endif
}
} // namespace fiphoboserver
\ No newline at end of file
} // namespace fiphoboserver
......@@ -46,4 +46,4 @@ private:
bool ioRunning = false;
};
} // namespace fiphoboserver
\ No newline at end of file
} // namespace fiphoboserver
......@@ -221,4 +221,4 @@ void FiPhobo::startFIFO()
return;
}
}
} // namespace fiphoboserver
\ No newline at end of file
} // namespace fiphoboserver
......@@ -46,4 +46,4 @@ private:
bool ioRunning = false;
};
} // namespace fiphoboserver
\ No newline at end of file
} // namespace fiphoboserver
import boto3
import uuid
import sys
key_string="ThisIsMyKey3"
if(len(sys.argv) > 1):
key_string = str(sys.argv[1])
def create_bucket_name(bucket_prefix):
# The generated bucket name must be between 3 and 63 chars long
......@@ -41,7 +46,7 @@ first_file_name = "ThisIsMyKey1"
s3_client.upload_file(
Filename="EmperorWu.txt", Bucket=first_bucket_name,
Key="ThisIsMyKey3")
Key=key_string)
# s3_client.download_file(first_bucket_name, first_file_name).download_file(
# "downloadedFile.txt")
......@@ -73,4 +78,4 @@ s3_client.upload_file(
# print("put_object: ")
# print(response)
#print(s3_client.list_buckets())
\ No newline at end of file
#print(s3_client.list_buckets())
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment