1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
--- src/common.h
+++ src/common.h
@@ -42,6 +42,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
+#include <signal.h>
+#include <fcntl.h>
#include <boost/shared_ptr.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/convenience.hpp>
--- src/file.cpp
+++ src/file.cpp
@@ -74,9 +74,21 @@
}
bool StdFile::openWrite() {
+ // if file is a fifo, temporarily open it for read
+ int fd = -1;
+ struct stat st;
+ int s = stat(filename.c_str(), &st);
+ if (s != -1 && S_ISFIFO(st.st_mode))
+ fd = ::open(filename.c_str(), O_RDONLY | O_NONBLOCK);
+
// open file for write in append mode
ios_base::openmode mode = fstream::out | fstream::app;
- return open(mode);
+ bool r = open(mode);
+
+ // close fifo
+ if (fd != -1)
+ ::close(fd);
+ return r;
}
bool StdFile::openTruncate() {
--- src/scribe_server.cpp
+++ src/scribe_server.cpp
@@ -55,6 +55,8 @@
if (-1 == setrlimit(RLIMIT_NOFILE, &r_fd)) {
LOG_OPER("setrlimit error (setting max fd size)");
}
+
+ signal(SIGPIPE, SIG_IGN);
int next_option;
const char* const short_options = "hp:c:";
@@ -110,7 +112,7 @@
}
TNonblockingServer server(processor, binaryProtocolFactory,
- g_Handler->port, thread_manager);
+ g_Handler->host, g_Handler->port, thread_manager);
LOG_OPER("Starting scribe server on port %lu", g_Handler->port);
fflush(stderr);
@@ -583,6 +585,8 @@
throw runtime_error("No port number configured");
}
+ config.getString("host", host);
+
// check if config sets the size to use for the ThreadManager
unsigned long int num_threads;
if (config.getUnsigned("num_thrift_server_threads", num_threads)) {
--- src/scribe_server.h
+++ src/scribe_server.h
@@ -51,6 +51,7 @@
void setStatusDetails(const std::string& new_status_details);
unsigned long int port; // it's long because that's all I implemented in the conf class
+ std::string host;
// number of threads processing new Thrift connections
size_t numThriftServerThreads;
|
