You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by rr...@apache.org on 2018/07/31 22:10:21 UTC

[trafficserver] branch master updated: Removes remnants of dprintf support

This is an automated email from the ASF dual-hosted git repository.

rrm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new 5c23970  Removes remnants of dprintf support
5c23970 is described below

commit 5c23970beaf29f64bfbcbef4b895043fb2786874
Author: Randall Meyer <ra...@yahoo.com>
AuthorDate: Mon Jul 30 10:17:31 2018 -0700

    Removes remnants of dprintf support
    
    dprintf removed in 948b6af04c1c9448bb6c3a81fad222fc681ebcbe
---
 doc/appendices/command-line/traffic_server.en.rst | 2 --
 lib/ts/ink_error.h                                | 2 --
 src/traffic_server/traffic_server.cc              | 8 +++-----
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/doc/appendices/command-line/traffic_server.en.rst b/doc/appendices/command-line/traffic_server.en.rst
index 4429098..247dfca 100644
--- a/doc/appendices/command-line/traffic_server.en.rst
+++ b/doc/appendices/command-line/traffic_server.en.rst
@@ -55,8 +55,6 @@ Disable free list in ProxyAllocator which were left out by the -f
 option. Please note that this option is a temporary, testing
 option, and will be removed in the future.
 
-.. option:: -o LEVEL, --dprintf_level LEVEL
-
 .. option:: -R LEVEL, --regression LEVEL
 
 .. option:: -r TEST, --regression_test TEST
diff --git a/lib/ts/ink_error.h b/lib/ts/ink_error.h
index d686ce0..82e8fdb 100644
--- a/lib/ts/ink_error.h
+++ b/lib/ts/ink_error.h
@@ -59,5 +59,3 @@ void ink_pwarning(const char *message_format, ...) TS_PRINTFLIKE(1, 2);
 void ink_notice(const char *message_format, ...) TS_PRINTFLIKE(1, 2);
 void ink_eprintf(const char *message_format, ...) TS_PRINTFLIKE(1, 2);
 void ink_error(const char *message_format, ...) TS_PRINTFLIKE(1, 2);
-
-int ink_set_dprintf_level(int debug_level);
diff --git a/src/traffic_server/traffic_server.cc b/src/traffic_server/traffic_server.cc
index 0e78668..5051a82 100644
--- a/src/traffic_server/traffic_server.cc
+++ b/src/traffic_server/traffic_server.cc
@@ -156,10 +156,9 @@ static int show_statistics                 = 0;
 static inkcoreapi DiagsConfig *diagsConfig = nullptr;
 HttpBodyFactory *body_factory              = nullptr;
 
-static int accept_mss             = 0;
-static int cmd_line_dprintf_level = 0;  // default debug output level from ink_dprintf function
-static int poll_timeout           = -1; // No value set.
-static int cmd_disable_freelist   = 0;
+static int accept_mss           = 0;
+static int poll_timeout         = -1; // No value set.
+static int cmd_disable_freelist = 0;
 
 static bool signal_received[NSIG];
 
@@ -176,7 +175,6 @@ static ArgumentDescription argument_descriptions[] = {
   {"accept_thread", 'a', "Use an Accept Thread", "T", &num_accept_threads, "PROXY_ACCEPT_THREAD", nullptr},
   {"accept_till_done", 'b', "Accept Till Done", "T", &accept_till_done, "PROXY_ACCEPT_TILL_DONE", nullptr},
   {"httpport", 'p', "Port descriptor for HTTP Accept", "S*", &http_accept_port_descriptor, "PROXY_HTTP_ACCEPT_PORT", nullptr},
-  {"dprintf_level", 'o', "Debug output level", "I", &cmd_line_dprintf_level, "PROXY_DPRINTF_LEVEL", nullptr},
   {"disable_freelist", 'f', "Disable the freelist memory allocator", "T", &cmd_disable_freelist, "PROXY_DPRINTF_LEVEL", nullptr},
   {"disable_pfreelist", 'F', "Disable the freelist memory allocator in ProxyAllocator", "T", &cmd_disable_pfreelist,
    "PROXY_DPRINTF_LEVEL", nullptr},