← Back to branch summary

~ubuntu-branches/ubuntu/wily/trafficserver/wily

« back to all changes in this revision

Viewing changes to proxy/logging/LogObject.cc

  • Committer: Bazaar Package Importer
  • Author(s): Arno Töll
  • Date: 2011-08-02 22:58:37 UTC
  • mfrom: (5.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110802225837-9za69cy1kq4vh93m
Tags: 3.0.1-2
http://bugs.debian.org/636338
* Fix "please add armhf to the arch list" - add armhf to the list of supported
  architectures. Thanks Konstantinos Margaritis for the hint (Closes: #636338)
* Remove IA64 from the list of supported architectures. The upgrade to the gcc
  4.6 toolchain disclosed portability issues with it, which caused the resul-
  ting binary package to produce no-op code in some functions. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
proxy/logging/LogObject.cc
83
83
                     const char *basename, LogFileFormat file_format,
84
84
                     const char *header, int rolling_enabled,
85
85
                     int rolling_interval_sec, int rolling_offset_hr, int rolling_size_mb)
86
 
:m_alt_filename(NULL)
87
 
  , m_flags(0)
88
 
  , m_signature(0)
89
 
  , m_ref_count(0)
90
 
  , m_log_buffer(NULL)
 
86
  : m_alt_filename(NULL),
 
87
    m_flags(0),
 
88
    m_signature(0),
 
89
    m_ref_count(0),
 
90
    m_log_buffer(NULL)
 
91
{
 
92
  init(format, log_dir, basename, file_format, header, rolling_enabled, rolling_interval_sec,
 
93
       rolling_offset_hr, rolling_size_mb);
 
94
}
 
95
 
 
96
LogObject::LogObject(LogFormat format, const char *log_dir,
 
97
                     const char *basename, LogFileFormat file_format,
 
98
                     const char *header, int rolling_enabled,
 
99
                     int rolling_interval_sec, int rolling_offset_hr, int rolling_size_mb)
 
100
  : m_alt_filename(NULL),
 
101
    m_flags(0),
 
102
    m_signature(0),
 
103
    m_ref_count(0),
 
104
    m_log_buffer(NULL)
 
105
{
 
106
  init(&format, log_dir, basename, file_format, header, rolling_enabled, rolling_interval_sec,
 
107
       rolling_offset_hr, rolling_size_mb);
 
108
}
 
109
 
 
110
void
 
111
LogObject::init(LogFormat * format, const char *log_dir,
 
112
                     const char *basename, LogFileFormat file_format,
 
113
                     const char *header, int rolling_enabled,
 
114
                     int rolling_interval_sec, int rolling_offset_hr, int rolling_size_mb)
91
115
{
92
116
  LogBuffer *tmp_lb_array[(DELAY_DELETE_SIZE + (DELAY_DELETE_SIZE / 4))];
93
117
  int i;
737
761
/*-------------------------------------------------------------------------
738
762
  TextLogObject::TextLogObject
739
763
  -------------------------------------------------------------------------*/
740
 
 
741
 
TextLogObject::TextLogObject(const char *name, const char *log_dir, bool timestamps, const char *header, int rolling_enabled, int rolling_interval_sec, int rolling_offset_hr, int rolling_size_mb):
742
 
 
743
 
LogObject(NEW(new LogFormat(TEXT_LOG)), log_dir, name, ASCII_LOG, header,
744
 
          rolling_enabled, rolling_interval_sec, rolling_offset_hr, rolling_size_mb), m_timestamps(timestamps)
 
764
TextLogObject::TextLogObject(const char *name, const char *log_dir, bool timestamps, const char *header, int rolling_enabled,
 
765
                             int rolling_interval_sec, int rolling_offset_hr, int rolling_size_mb)
 
766
  : LogObject(LogFormat(TEXT_LOG), log_dir, name, ASCII_LOG, header,
 
767
              rolling_enabled, rolling_interval_sec, rolling_offset_hr, rolling_size_mb), m_timestamps(timestamps)
745
768
{
746
769
}
747
770