From fd3955d8f033ea806a9c2336ac07be179b6a293d Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Sat, 20 Feb 2010 15:09:31 +0000
Subject: [PATCH] move cpd-ldp to discovery-protocols

git-svn-id: http://www.observium.org/svn/observer/trunk@888 61d68cd4-352d-0410-923a-c4978735b2b8
---
 discovery.php                                                 | 4 ++--
 .../{cdp-lldp.inc.php => discovery-protocols.inc.php}         | 0
 syslog.php                                                    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename includes/discovery/{cdp-lldp.inc.php => discovery-protocols.inc.php} (100%)

diff --git a/discovery.php b/discovery.php
index 8415160275..b1d6bce35f 100755
--- a/discovery.php
+++ b/discovery.php
@@ -113,8 +113,8 @@ while ($device = mysql_fetch_array($device_query))
   ## hr-device.inc.php
   include("includes/discovery/hr-device.inc.php");
 
-  ## CDP & LLDP
-  include("includes/discovery/cdp-lldp.inc.php");
+  ## Discovery Protocols (FDP, CDP & LLDP)
+  include("includes/discovery/discovery-protocols.inc.php");
 
   ## ARP Table
   include("includes/discovery/arp-table.php");
diff --git a/includes/discovery/cdp-lldp.inc.php b/includes/discovery/discovery-protocols.inc.php
similarity index 100%
rename from includes/discovery/cdp-lldp.inc.php
rename to includes/discovery/discovery-protocols.inc.php
diff --git a/syslog.php b/syslog.php
index 91d6cb0692..5698ed7873 100755
--- a/syslog.php
+++ b/syslog.php
@@ -9,7 +9,6 @@ $i="1";
 $s=fopen('php://stdin','r');
 while($line=fgets($s)){
  list($entry['host'],$entry['facility'],$entry['priority'], $entry['level'], $entry['tag'], $entry['timestamp'], $entry['msg']) = explode("||", trim($line));
- shell_exec('echo "'.$i.'. '.$entry['host'].' -> '.$entry['msg'].'" >> /tmp/syslog');
  process_syslog($entry, 1);
  unset($entry); unset($line);
  $i++;