Author: reinhard Date: 2011-04-18 03:59:06 -0500 (Mon, 18 Apr 2011) New Revision: 10314
Modified: trunk/gnue-common/ trunk/gnue-common/src/base/errors.py trunk/gnue-common/src/base/log.py Log: Never include exception name and message in details, and always print exception name and message additionally to details. Property changes on: trunk/gnue-common ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2011-04-18 10:03:25.819999933 +0200 committer: Reinhard Müller <reinhard.muel...@bytewise.at> properties: branch-nick: common + timestamp: 2011-04-18 10:55:02.470999956 +0200 committer: Reinhard Müller <reinhard.muel...@bytewise.at> properties: branch-nick: common Name: bzr:file-ids - src/base/errors.py 9803@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fbase%2Ferrors.py + src/base/errors.py 9803@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fbase%2Ferrors.py src/base/log.py 9758@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fbase%2Flog.py Name: bzr:revision-id:v4 - 3116 reinhard.muel...@bytewise.at-20100426083315-ccfwx2pihuvqn60z 3117 reinhard.muel...@bytewise.at-20100503114756-unpxm52de0towufo 3118 reinhard.muel...@bytewise.at-20100503115129-uvondrz5bvkqubyv 3119 reinhard.muel...@bytewise.at-20100505081835-9peco6k7a2le0mvg 3120 reinhard.muel...@bytewise.at-20100505084742-wn5vtc4a129z8g28 3121 reinhard.muel...@bytewise.at-20100505092131-m2avvsci5w6aj0rv 3122 reinhard.muel...@bytewise.at-20100519151545-pybk8q2s234vzsf2 3123 reinhard.muel...@bytewise.at-20100525101023-xs7k6pkghh9t6fc3 3124 reinhard.muel...@bytewise.at-20100525114015-rj7eb0xdheqkcuql 3125 reinhard.muel...@bytewise.at-20100525145035-j177jbvu10me4mfp 3126 reinhard.muel...@bytewise.at-20100526111738-ic0wot9z1ulg2y1a 3127 reinhard.muel...@bytewise.at-20100612121357-1nf23tuj1tveh1lv 3128 reinhard.muel...@bytewise.at-20100929190642-6pp6cwlicgt2bhhs 3129 reinhard.muel...@bytewise.at-20100929190817-bje4kkvrjrpanut1 3130 reinhard.muel...@bytewise.at-20101016191602-kceb6hdjytt4im93 3131 reinhard.muel...@bytewise.at-20101020175112-o65lqy8lejjrvzaz 3132 reinhard.muel...@bytewise.at-20101020195535-gb2bt2h80mu5j5h4 3133 reinhard.muel...@bytewise.at-20101020203525-nvdwy7b9r84bngco 3134 reinhard.muel...@bytewise.at-20101028150844-49qu2auedxl5b5kv 3135 reinhard.muel...@bytewise.at-20101028152619-p6ytgkke9zw38o7a 3136 reinhard.muel...@bytewise.at-20101102085744-sfxbu24ep3nwxixc 3137 reinhard.muel...@bytewise.at-20101102085857-sgtswbhhj0baf9d7 3138 reinhard.muel...@bytewise.at-20101103071215-929sbj5boj2wcxuu 3139 reinhard.muel...@bytewise.at-20101114130053-ueyx4ilszsilw6hc 3140 reinhard.muel...@bytewise.at-20101114183532-h66yegryl7hcen0f 3141 reinhard.muel...@bytewise.at-20101130142356-cxfqmitx4trkjcja 3142 reinhard.muel...@bytewise.at-20101201235201-z7jjs7xhfmonjcni 3143 reinhard.muel...@bytewise.at-20101202213225-9hj88a0rur552boy 3144 reinhard.muel...@bytewise.at-20101202222236-g81i5zcnxr8l2q7o 3145 reinhard.muel...@bytewise.at-20101202232811-ydwqz1rwr8a17fad 3146 reinhard.muel...@bytewise.at-20101202235915-yhfdb6fvj5znz35y 3147 reinhard.muel...@bytewise.at-20101216212153-y9oprapjl2z2gnh2 3148 reinhard.muel...@bytewise.at-20101216213128-i3zvbyb1mhx6i5jp 3149 reinhard.muel...@bytewise.at-20110128101843-8qa9x9tvae5mrt7g 3150 reinhard.muel...@bytewise.at-20110128105648-3ffqgfxlmh9u80p4 3151 whizman_software_solutions_www.whizman.com-20110131200839-1fm0kcoi0hn3u14c 3152 whizman.com-20110217020317-icwlxpg3y0q9w8g5 3153 reinhard.muel...@bytewise.at-20110418080325-e17ctkjv2xh1b1in + 3116 reinhard.muel...@bytewise.at-20100426083315-ccfwx2pihuvqn60z 3117 reinhard.muel...@bytewise.at-20100503114756-unpxm52de0towufo 3118 reinhard.muel...@bytewise.at-20100503115129-uvondrz5bvkqubyv 3119 reinhard.muel...@bytewise.at-20100505081835-9peco6k7a2le0mvg 3120 reinhard.muel...@bytewise.at-20100505084742-wn5vtc4a129z8g28 3121 reinhard.muel...@bytewise.at-20100505092131-m2avvsci5w6aj0rv 3122 reinhard.muel...@bytewise.at-20100519151545-pybk8q2s234vzsf2 3123 reinhard.muel...@bytewise.at-20100525101023-xs7k6pkghh9t6fc3 3124 reinhard.muel...@bytewise.at-20100525114015-rj7eb0xdheqkcuql 3125 reinhard.muel...@bytewise.at-20100525145035-j177jbvu10me4mfp 3126 reinhard.muel...@bytewise.at-20100526111738-ic0wot9z1ulg2y1a 3127 reinhard.muel...@bytewise.at-20100612121357-1nf23tuj1tveh1lv 3128 reinhard.muel...@bytewise.at-20100929190642-6pp6cwlicgt2bhhs 3129 reinhard.muel...@bytewise.at-20100929190817-bje4kkvrjrpanut1 3130 reinhard.muel...@bytewise.at-20101016191602-kceb6hdjytt4im93 3131 reinhard.muel...@bytewise.at-20101020175112-o65lqy8lejjrvzaz 3132 reinhard.muel...@bytewise.at-20101020195535-gb2bt2h80mu5j5h4 3133 reinhard.muel...@bytewise.at-20101020203525-nvdwy7b9r84bngco 3134 reinhard.muel...@bytewise.at-20101028150844-49qu2auedxl5b5kv 3135 reinhard.muel...@bytewise.at-20101028152619-p6ytgkke9zw38o7a 3136 reinhard.muel...@bytewise.at-20101102085744-sfxbu24ep3nwxixc 3137 reinhard.muel...@bytewise.at-20101102085857-sgtswbhhj0baf9d7 3138 reinhard.muel...@bytewise.at-20101103071215-929sbj5boj2wcxuu 3139 reinhard.muel...@bytewise.at-20101114130053-ueyx4ilszsilw6hc 3140 reinhard.muel...@bytewise.at-20101114183532-h66yegryl7hcen0f 3141 reinhard.muel...@bytewise.at-20101130142356-cxfqmitx4trkjcja 3142 reinhard.muel...@bytewise.at-20101201235201-z7jjs7xhfmonjcni 3143 reinhard.muel...@bytewise.at-20101202213225-9hj88a0rur552boy 3144 reinhard.muel...@bytewise.at-20101202222236-g81i5zcnxr8l2q7o 3145 reinhard.muel...@bytewise.at-20101202232811-ydwqz1rwr8a17fad 3146 reinhard.muel...@bytewise.at-20101202235915-yhfdb6fvj5znz35y 3147 reinhard.muel...@bytewise.at-20101216212153-y9oprapjl2z2gnh2 3148 reinhard.muel...@bytewise.at-20101216213128-i3zvbyb1mhx6i5jp 3149 reinhard.muel...@bytewise.at-20110128101843-8qa9x9tvae5mrt7g 3150 reinhard.muel...@bytewise.at-20110128105648-3ffqgfxlmh9u80p4 3151 whizman_software_solutions_www.whizman.com-20110131200839-1fm0kcoi0hn3u14c 3152 whizman.com-20110217020317-icwlxpg3y0q9w8g5 3153 reinhard.muel...@bytewise.at-20110418080325-e17ctkjv2xh1b1in 3154 reinhard.muel...@bytewise.at-20110418085502-hl8b53wwnoblvkjq Name: bzr:text-parents - src/base/errors.py reinhard.muel...@bytewise.at-20100519151545-pybk8q2s234vzsf2 + src/base/log.py reinhard.muel...@bytewise.at-20101202213225-9hj88a0rur552boy Modified: trunk/gnue-common/src/base/errors.py =================================================================== --- trunk/gnue-common/src/base/errors.py 2011-04-18 08:59:03 UTC (rev 10313) +++ trunk/gnue-common/src/base/errors.py 2011-04-18 08:59:06 UTC (rev 10314) @@ -339,12 +339,12 @@ if isinstance(evalue, Error) and evalue.detail is not None: detail = evalue.detail else: - lines = traceback.format_exception(etype, evalue, etraceback) + lines = traceback.format_tb(etraceback) # Delete lines in the traceback as requested. if tb_skip: del lines[1:tb_skip + 1] - # traceback.format_exception() returns an 8 bit string encoded in the + # traceback.format_tb() returns an 8 bit string encoded in the # current encoding, so we have to convert to Unicode. - detail = i18n.inconv(''.join(lines)) + detail = i18n.inconv("".join(lines)) return (group, name, message, detail) Modified: trunk/gnue-common/src/base/log.py =================================================================== --- trunk/gnue-common/src/base/log.py 2011-04-18 08:59:03 UTC (rev 10313) +++ trunk/gnue-common/src/base/log.py 2011-04-18 08:59:06 UTC (rev 10314) @@ -373,7 +373,7 @@ (group, name, message, detail) = errors.format_exception(etype, evalue, etraceback) logger = "exception.%s.%s" % (group, name) - text = u_("Unhandled exception %s:\n%s") % (name, detail) + text = u_("Unhandled exception %s: %s\n%s") % (name, message, detail) error_n(logger, text) @@ -398,7 +398,7 @@ # module, since we want to show the details as returned by get_exception # instead of the standard traceback. (group, name, message, detail) = errors.get_exception() - error(msg + '\n' + detail, *args, **kwargs) + error(msg + ": " + name + ": " + message + "\n" + detail, *args, **kwargs) return True # ----------------------------------------------------------------------------- @@ -409,7 +409,7 @@ the current call stack. """ - debug(msg + '\n' + ''.join(traceback.format_stack( + debug(msg + "\n" + "".join(traceback.format_stack( inspect.currentframe().f_back)), *args, **kwargs) @@ -435,8 +435,9 @@ # We don't use the standard exception handling feature in Python's logging # module, since we want to show the details as returned by get_exception # instead of the standard traceback. - (group, name, message, detail) = errors.get_exception() - error_n(msg + '\n' + detail, *args, **kwargs) + (group, ename, message, detail) = errors.get_exception() + error_n(name, msg + "\n" + ename + ": " + message + "\n" + detail, *args, + **kwargs) return True # ----------------------------------------------------------------------------- @@ -447,7 +448,7 @@ including information about the current call stack. """ - debug_n(name, msg + '\n' + ''.join(traceback.format_stack( + debug_n(name, msg + "\n" + "".join(traceback.format_stack( inspect.currentframe().f_back)), *args, **kwargs) _______________________________________________ commit-gnue mailing list commit-gnue@gnu.org http://lists.gnu.org/mailman/listinfo/commit-gnue