Revision df726590
| b/lib/constants.py | ||
|---|---|---|
| 207 | 207 |
for extra in DAEMONS_EXTRA_LOGBASE[daemon])) |
| 208 | 208 |
for daemon in DAEMONS_EXTRA_LOGBASE) |
| 209 | 209 |
|
| 210 |
DEV_CONSOLE = "/dev/console"
|
|
| 210 |
DEV_CONSOLE = _constants.DEV_CONSOLE
|
|
| 211 | 211 |
|
| 212 | 212 |
PROC_MOUNTS = "/proc/mounts" |
| 213 | 213 |
|
| ... | ... | |
| 220 | 220 |
LUXI_OVERRIDE_QUERY = "query" |
| 221 | 221 |
|
| 222 | 222 |
# one of "no", "yes", "only" |
| 223 |
SYSLOG_USAGE = _autoconf.SYSLOG_USAGE
|
|
| 224 |
SYSLOG_NO = "no"
|
|
| 225 |
SYSLOG_YES = "yes"
|
|
| 226 |
SYSLOG_ONLY = "only"
|
|
| 227 |
SYSLOG_SOCKET = "/dev/log"
|
|
| 223 |
SYSLOG_USAGE = _constants.SYSLOG_USAGE
|
|
| 224 |
SYSLOG_NO = _constants.SYSLOG_NO
|
|
| 225 |
SYSLOG_YES = _constants.SYSLOG_YES
|
|
| 226 |
SYSLOG_ONLY = _constants.SYSLOG_ONLY
|
|
| 227 |
SYSLOG_SOCKET = _constants.SYSLOG_SOCKET
|
|
| 228 | 228 |
|
| 229 | 229 |
EXPORT_CONF_FILE = "config.ini" |
| 230 | 230 |
|
| b/src/AutoConf.hs.in | ||
|---|---|---|
| 127 | 127 |
drbdNoMetaFlush :: Bool |
| 128 | 128 |
drbdNoMetaFlush = DRBD_NO_META_FLUSH |
| 129 | 129 |
|
| 130 |
data SyslogUsageT |
|
| 131 |
= SyslogNo |
|
| 132 |
| SyslogYes |
|
| 133 |
| SyslogOnly |
|
| 134 |
deriving (Bounded, Enum) |
|
| 135 |
|
|
| 136 |
instance Read SyslogUsageT where |
|
| 137 |
readsPrec _ r = do |
|
| 138 |
(s, r') <- lex r |
|
| 139 |
case s of |
|
| 140 |
"no" -> [(SyslogNo, r')] |
|
| 141 |
"yes" -> [(SyslogYes, r')] |
|
| 142 |
"only" -> [(SyslogOnly, r')] |
|
| 143 |
_ -> [] |
|
| 144 |
|
|
| 145 |
instance Show SyslogUsageT where |
|
| 146 |
show SyslogNo = "no" |
|
| 147 |
show SyslogYes = "yes" |
|
| 148 |
show SyslogOnly = "only" |
|
| 149 |
|
|
| 150 |
syslogUsage :: SyslogUsageT |
|
| 151 |
syslogUsage = read "SYSLOG_USAGE" :: SyslogUsageT |
|
| 130 |
syslogUsage :: String |
|
| 131 |
syslogUsage = "SYSLOG_USAGE" |
|
| 152 | 132 |
|
| 153 | 133 |
daemonsGroup :: String |
| 154 | 134 |
daemonsGroup = "DAEMONS_GROUP" |
| b/src/Ganeti/ConstantUtils.hs | ||
|---|---|---|
| 71 | 71 |
-- between 'Ganeti.HsConstants' and 'Ganeti.Runtime' |
| 72 | 72 |
exitFailure :: Int |
| 73 | 73 |
exitFailure = 1 |
| 74 |
|
|
| 75 |
-- | Console device |
|
| 76 |
-- |
|
| 77 |
-- This is defined here and not in 'Ganeti.HsConstants' order to avoid |
|
| 78 |
-- a circular dependency between 'Ganeti.HsConstants' and |
|
| 79 |
-- 'Ganeti.Logging' |
|
| 80 |
devConsole :: String |
|
| 81 |
devConsole = "/dev/console" |
|
| b/src/Ganeti/HsConstants.hs | ||
|---|---|---|
| 41 | 41 |
|
| 42 | 42 |
import AutoConf |
| 43 | 43 |
import Ganeti.ConstantUtils (FrozenSet, Protocol(..)) |
| 44 |
import qualified Ganeti.ConstantUtils as ConstantUtils (mkSet, exitFailure)
|
|
| 44 |
import qualified Ganeti.ConstantUtils as ConstantUtils |
|
| 45 | 45 |
import Ganeti.Runtime (GanetiDaemon(..), MiscGroup(..), GanetiGroup(..), |
| 46 | 46 |
ExtraLogReason(..)) |
| 47 |
import Ganeti.Logging (SyslogUsage(..)) |
|
| 48 |
import qualified Ganeti.Logging as Logging (syslogUsageToRaw) |
|
| 47 | 49 |
import qualified Ganeti.Runtime as Runtime |
| 48 | 50 |
|
| 49 | 51 |
-- * Admin states |
| ... | ... | |
| 178 | 180 |
extraLogreasonError :: String |
| 179 | 181 |
extraLogreasonError = Runtime.daemonsExtraLogbase GanetiMond ErrorLog |
| 180 | 182 |
|
| 183 |
devConsole :: String |
|
| 184 |
devConsole = ConstantUtils.devConsole |
|
| 185 |
|
|
| 186 |
-- * Syslog |
|
| 187 |
|
|
| 188 |
syslogUsage :: String |
|
| 189 |
syslogUsage = AutoConf.syslogUsage |
|
| 190 |
|
|
| 191 |
syslogNo :: String |
|
| 192 |
syslogNo = Logging.syslogUsageToRaw SyslogNo |
|
| 193 |
|
|
| 194 |
syslogYes :: String |
|
| 195 |
syslogYes = Logging.syslogUsageToRaw SyslogYes |
|
| 196 |
|
|
| 197 |
syslogOnly :: String |
|
| 198 |
syslogOnly = Logging.syslogUsageToRaw SyslogOnly |
|
| 199 |
|
|
| 200 |
syslogSocket :: String |
|
| 201 |
syslogSocket = "/dev/log" |
|
| 202 |
|
|
| 181 | 203 |
-- * Common exit codes |
| 182 | 204 |
|
| 183 | 205 |
exitSuccess :: Int |
| b/src/Ganeti/Logging.hs | ||
|---|---|---|
| 55 | 55 |
import System.IO |
| 56 | 56 |
|
| 57 | 57 |
import Ganeti.THH |
| 58 |
import qualified Ganeti.Constants as C
|
|
| 58 |
import qualified Ganeti.ConstantUtils as ConstantUtils
|
|
| 59 | 59 |
|
| 60 | 60 |
-- | Syslog usage type. |
| 61 |
$(declareSADT "SyslogUsage"
|
|
| 62 |
[ ("SyslogNo", 'C.syslogNo)
|
|
| 63 |
, ("SyslogYes", 'C.syslogYes)
|
|
| 64 |
, ("SyslogOnly", 'C.syslogOnly)
|
|
| 61 |
$(declareLADT ''String "SyslogUsage"
|
|
| 62 |
[ ("SyslogNo", "no")
|
|
| 63 |
, ("SyslogYes", "yes")
|
|
| 64 |
, ("SyslogOnly", "only")
|
|
| 65 | 65 |
]) |
| 66 | 66 |
|
| 67 | 67 |
-- | Builds the log formatter. |
| ... | ... | |
| 98 | 98 |
-> IO () |
| 99 | 99 |
setupLogging logf program debug stderr_logging console syslog = do |
| 100 | 100 |
let level = if debug then DEBUG else INFO |
| 101 |
destf = if console then Just C.devConsole else logf |
|
| 101 |
destf = if console then Just ConstantUtils.devConsole else logf
|
|
| 102 | 102 |
fmt = logFormatter program False False |
| 103 | 103 |
file_logging = syslog /= SyslogOnly |
| 104 | 104 |
|
Also available in: Unified diff