flume-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject [2/2] git commit: FLUME-1740: Remove contrib/ directory from Flume NG
Date Thu, 29 Nov 2012 16:36:38 GMT
FLUME-1740: Remove contrib/ directory from Flume NG

(Mike Percy via Brock Noland)


Project: http://git-wip-us.apache.org/repos/asf/flume/repo
Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/e1f6e42c
Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/e1f6e42c
Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/e1f6e42c

Branch: refs/heads/flume-1.3.0
Commit: e1f6e42cb7f5d3ab4785c8e5a66007d1b175ed96
Parents: a6bfb2c
Author: Brock Noland <brock@apache.org>
Authored: Thu Nov 29 10:32:56 2012 -0600
Committer: Brock Noland <brock@apache.org>
Committed: Thu Nov 29 10:33:37 2012 -0600

----------------------------------------------------------------------
 contrib/flogger/Makefile                       |   47 -----
 contrib/flogger/README                         |   34 ----
 contrib/flogger/src/cpp/ThriftThinFlumeRPC.cpp |  180 -------------------
 3 files changed, 0 insertions(+), 261 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flume/blob/e1f6e42c/contrib/flogger/Makefile
----------------------------------------------------------------------
diff --git a/contrib/flogger/Makefile b/contrib/flogger/Makefile
deleted file mode 100644
index bf718c6..0000000
--- a/contrib/flogger/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-CC = g++
-SRCS = src/cpp/ThriftThinFlumeRPC.cpp
-THRIFT_SRCS = gen-cpp/ThriftFlumeEventServer.cpp gen-cpp/flume_constants.cpp gen-cpp/flume_types.cpp
src/cpp/ThriftThinFlumeRPC.cpp
-FLUME_THRIFT_IDL = ../../flume-core/src/main/thrift/flume.thrift
-OBJS = gen-cpp/ThriftFlume.o gen-cpp/ThriftFlumeConstants.o gen-cpp/ThriftFlumeTypes.o
-
-.PHONY: all
-all: flogger
-
-
-flogger: ${OBJS}
-	${CC} -Wall -I/usr/local/include/thrift -c gen-cpp/ThriftFlumeEventServer.cpp -o gen-cpp/ThriftFlume.o
-	${CC} -Wall -I/usr/local/include/thrift -c gen-cpp/flume_constants.cpp -o gen-cpp/ThriftFlumeConstants.o
-	${CC} -Wall -I/usr/local/include/thrift -c gen-cpp/flume_types.cpp -o gen-cpp/ThriftFlumeTypes.o
-	${CC} -Wall -I/usr/local/include/thrift -Igen-cpp/ -c src/cpp/ThriftThinFlumeRPC.cpp -o
gen-cpp/thinFlumeclient.o
-	${CC} -Wall -L/usr/local/lib ${OBJS} gen-cpp/thinFlumeclient.o -lthrift -lrt -static -o
flogger
-
-${OBJS}: ${THRIFT_SRCS}
-
-${THRIFT_SRCS}: ${FLUME_THRIFT_IDL}
-	thrift --gen cpp ${FLUME_THRIFT_IDL}
-
-.PHONY: clean
-clean:
-	rm -rf gen-cpp/
-	rm flogger
-
-.PHONY: install
-install: flogger
-	cp flogger /usr/local/bin/

http://git-wip-us.apache.org/repos/asf/flume/blob/e1f6e42c/contrib/flogger/README
----------------------------------------------------------------------
diff --git a/contrib/flogger/README b/contrib/flogger/README
deleted file mode 100644
index 81bdb11..0000000
--- a/contrib/flogger/README
+++ /dev/null
@@ -1,34 +0,0 @@
-Synopsis: flogger -h <hostname>:<port> [-t <key>:<value>]
-
-Description: flogger is a commandline utility that will send data to a flume node listening
on specified <hostname>:<port>
-             <hostname>:<port> is mandatory.
-             flogger will optionally tag the data with specified <key>:<value>
-
-Prerequisites for flogger installation:
-1. Linux
-2. Thrift installed
-
-Prerequisites for flogger Testing:
-1. Hadoop installed
-2. Flume installed
-3. A Flume node listening on a port 
-   e.g.: flume dump 'rpcSource(12345)'
-
-Intallation:
-From the 'contrib/flogger' directory
-1. make
-2. sudo make install
-
-Usage:
-1. For instance, run a flume node on localhost and port:12345
-    $bin/flume dump 'rpcSource(12345)'
-
-2. On a machine where flogger is installed
-    $flogger -h localhost:12345
-    my message
-
-In above e.g. the flume node will dump the message to console like
-[INFO Tue Aug 31 20:51:12 PDT 2010] my message
-
-3. $top | flogger -h localhost:12345
-will send the output of top to the flume node.

http://git-wip-us.apache.org/repos/asf/flume/blob/e1f6e42c/contrib/flogger/src/cpp/ThriftThinFlumeRPC.cpp
----------------------------------------------------------------------
diff --git a/contrib/flogger/src/cpp/ThriftThinFlumeRPC.cpp b/contrib/flogger/src/cpp/ThriftThinFlumeRPC.cpp
deleted file mode 100644
index 05bcb24..0000000
--- a/contrib/flogger/src/cpp/ThriftThinFlumeRPC.cpp
+++ /dev/null
@@ -1,180 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#define  HOST_ARG "-h"
-#define  TAG_ARG  "-t"
-#include <ThriftFlumeEventServer.h>  // server interface
-#include <time.h>
-#include <stdlib.h>
-#include <string.h>
-#include <transport/TSocket.h>
-#include <transport/TBufferTransports.h>
-#include <protocol/TBinaryProtocol.h>
-#include <unistd.h>
-#include <sys/param.h>
-#include <iostream>
-#include <string>
-#include <sstream>
-#include <map>
-
-using namespace std;
-using namespace apache::thrift;
-using namespace apache::thrift::protocol;
-using namespace apache::thrift::transport;
-
-/*
- * The main function takes -h localhost:port-number and -t tag_key:value as arguments.
- * It forms a flume event structure with time-stamp taken from the system clock and hostname.
- * It sends the request to the flume node listening on the host-port specified
- * Returns 0 on success, returns 1 on failure, error codes not yet defined
-*/
-
-int main(int argc, char **argv) {
-
-  string host_port;
-  string tag_value;
-
-  switch(argc)
-  {
-    case 3:
-       if(0 == strcmp(argv[1], HOST_ARG)) {
-          host_port = argv[2];
-       } else {
-          cout << "\tUsage: [-h <hostname>:<port>] is mandatory" <<
endl;
-          exit(1);
-       }
-       break;
-    case 5:
-       if((0 == strcmp(argv[1], HOST_ARG)) && (0 == strcmp(argv[3], TAG_ARG))) {
-          host_port = argv[2];
-          tag_value = argv[4];
-       } else if ((0 == strcmp(argv[1], TAG_ARG)) && (0 == strcmp(argv[3], HOST_ARG)))
{
-          host_port = argv[4];
-          tag_value = argv[2];
-       } else {
-          cout << "\tWrong Options!" << endl;
-          cout << "\tSynopsis: flogger -h <hostname>:<port> [-t <key>:<value>]"
<< endl;
-          exit(1);
-       }
-       break;
-     default:
-       cout << "\tflogger will send the lines piped to it or by default from stdin
to hostname:port w/ tag" << endl;
-       cout << "\tSynopsis: flogger -h <hostname>:<port> [-t <key>:<value>]"
<< endl;
-       exit(1);
-       break;
-  }
-
-  string host;
-  string port;
-  {
-      stringstream ss (host_port);
-      if(!getline(ss, host, ':'))
-      {
-        cout << "\tWrong delimiter for -h, use <hostname>:<port>" <<
endl;
-        exit(1);
-      }
-      if(!getline(ss, port, ':'))
-      {
-        cout << "\tWrong delimiter for -h, use <hostname>:<port>" <<
endl;
-        exit(1);
-      }
-  }
-
-  string tag_val;
-  string tag_key;
-  if(argc == 5)
-  {
-     stringstream ss (tag_value);
-     if(!getline(ss, tag_key, ':'))
-     {
-       cout << "\tWrong delimiter for -t, use <key>:<value> " <<
endl;
-       exit(1);
-     }
-
-     if(!getline(ss, tag_value, ':'))
-     {
-       cout << "\tWrong delimiter for -t, use <key>:<value> " <<
endl;
-       exit(1);
-     }
-  }
-
-  boost::shared_ptr<TSocket> socket(new TSocket(host.c_str(), atoi(port.c_str())));
-  boost::shared_ptr<TTransport> transport(new TBufferedTransport(socket));
-  boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
-
-
-  string line;
-  char hostname[HOST_NAME_MAX];
-  if(0 != gethostname(hostname, HOST_NAME_MAX))
-  {
-   cerr << "\n\tError: Cannot get hostname" << endl;
-   exit(1);
-  }
-
-  map <string,string> tag;
-  if(argc == 5)
-  {
-   tag[tag_key] = tag_value;
-  }
-
-  try {
-      ThriftFlumeEventServerClient client(protocol);
-      transport->open();
-      while(getline(cin,line))
-      {
-        /*
-	   ThriftFlumeEvt parameters
-	   nanos: uses CLOCK_PROCESS_CPUTIME_ID High-resolution per-process timer from the CPU.
-	*/
-
-	ThriftFlumeEvent evt;
-	Priority evt_priority;
-	evt.priority = evt_priority.INFO;
-	struct timespec t_nanos;
-	if(0 == clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &t_nanos)) {
-	 evt.nanos = t_nanos.tv_sec * 1000000000LL + t_nanos.tv_nsec;
-	} else {
-	 cerr << "\n\tCannot read process cputime clock, quitting";
-	 exit(1);
-	}
-
-	struct timespec t_stamp;
-	if(0 == clock_gettime(CLOCK_REALTIME, &t_stamp)) {
-	 evt.timestamp = (int64_t)t_stamp.tv_sec * 1000; // timestamp is needed in milliseconds
-	} else {
-	 cerr << "\n\tCannot read system clock, quitting";
-	 exit(1);
-	}
-
-	evt.host = std::string(hostname);
-	evt.body = line;
-        if(argc == 5)
-        {
-	 evt.fields = tag;
-        }
-	client.append(evt);
-      }
-      transport->close();
-   } catch( ... ) {
-      cerr << "\tException raised!" << endl;
-      exit(1);
-   }
-
-  return 0;
-}


Mime
View raw message