octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-12-23 09:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added -s option to pass onto FUSE -- I'm not entirely

Browse Source 
sure of the usefulness or purpose of this option, but
am including it for completeness

Re-categorized SYS_INFO messages ot SYS_DEBUG messages
to reduce the amount of spew into syslog -- these can
be turned back on with the -d option
Resolves issue #120



git-svn-id: http://s3fs.googlecode.com/svn/trunk@274 df820570-a93a-0410-bd06-b72b767a4274
This commit is contained in:
mooredan@suncup.net 2010-12-04 20:07:08 +00:00
parent 5d2c29976a
commit 99781e70bc
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/s3fs.cpp
View File

@ -664,7 +664,7 @@ int get_local_fd(const char* path) {
auto_curl_slist headers; auto_curl_slist headers;
string date = get_date(); string date = get_date();
syslog(LOG_INFO, "LOCAL FD"); if(debug) syslog(LOG_DEBUG, "LOCAL FD");
headers.append("Date: " + date); headers.append("Date: " + date);
headers.append("Content-Type: "); headers.append("Content-Type: ");
if (public_bucket.substr(0,1) != "1") { if (public_bucket.substr(0,1) != "1") {
@ -743,7 +743,7 @@ static int put_headers(const char* path, headers_t meta) {
//###rewind(f); //###rewind(f);
syslog(LOG_INFO, "copy path=%s", path); if(debug) syslog(LOG_DEBUG, "copy path=%s", path);
cout << "copying[path=" << path << "]" << endl; cout << "copying[path=" << path << "]" << endl;
string my_url = prepare_url(url.c_str()); string my_url = prepare_url(url.c_str());
@ -813,7 +813,7 @@ static int put_local_fd(const char* path, headers_t meta, int fd) {
//###rewind(f); //###rewind(f);
syslog(LOG_INFO, "upload path=%s size=%llu", path, st.st_size); if(debug) syslog(LOG_DEBUG, "upload path=%s size=%llu", path, st.st_size);
cout << "uploading[path=" << path << "][fd=" << fd << "][size="<<st.st_size <<"]" << endl; cout << "uploading[path=" << path << "][fd=" << fd << "][size="<<st.st_size <<"]" << endl;
string my_url = prepare_url(url.c_str()); string my_url = prepare_url(url.c_str());
@ -1699,7 +1699,7 @@ static void* s3fs_init(struct fuse_conn_info *conn) {
} }
static void s3fs_destroy(void*) { static void s3fs_destroy(void*) {
syslog(LOG_INFO, "destroy"); if(debug) syslog(LOG_DEBUG, "destroy");
// openssl // openssl
CRYPTO_set_id_callback(NULL); CRYPTO_set_id_callback(NULL);
CRYPTO_set_locking_callback(NULL); CRYPTO_set_locking_callback(NULL);
@ -2385,6 +2385,8 @@ static void show_help (void) {
" -d --debug Turn on DEBUG messages to syslog. Specifying -d\n" " -d --debug Turn on DEBUG messages to syslog. Specifying -d\n"
" twice turns on FUSE debug messages to STDOUT.\n" " twice turns on FUSE debug messages to STDOUT.\n"
" -f FUSE foreground option - do not run as daemon.\n" " -f FUSE foreground option - do not run as daemon.\n"
" -s FUSE singlethread option\n"
" disable multi-threaded operation\n"
"\n" "\n"
"\n" "\n"
"Report bugs to <s3fs-devel@googlegroups.com>\n" "Report bugs to <s3fs-devel@googlegroups.com>\n"
@ -2590,7 +2592,7 @@ int main(int argc, char *argv[]) {
program_name.replace(0, found+1, ""); program_name.replace(0, found+1, "");
} }
while ((ch = getopt_long(argc, argv, "dho:f", long_opts, &option_index)) != -1) { while ((ch = getopt_long(argc, argv, "dho:fs", long_opts, &option_index)) != -1) {
switch (ch) { switch (ch) {
case 0: case 0:
if (strcmp(long_opts[option_index].name, "version") == 0) { if (strcmp(long_opts[option_index].name, "version") == 0) {
@ -2611,6 +2613,9 @@ int main(int argc, char *argv[]) {
case 'f': case 'f':
break; break;
case 's':
break;
default: default:
exit(1); exit(1);
} }