hslogger 1.0.12 → 1.3.2.0
raw patch · 18 files changed
Files
- CHANGELOG.md +36/−0
- COPYING +0/−510
- COPYRIGHT +0/−25
- LICENSE +27/−0
- Setup.hs +0/−5
- hslogger.cabal +92/−56
- src/System/Log.hs +15/−25
- src/System/Log/Formatter.hs +113/−0
- src/System/Log/Handler.hs +10/−28
- src/System/Log/Handler/Growl.hs +32/−41
- src/System/Log/Handler/Log4jXML.hs +27/−52
- src/System/Log/Handler/Simple.hs +24/−44
- src/System/Log/Handler/Syslog.hs +102/−73
- src/System/Log/Logger.hs +112/−74
- src/UTF8.hs +44/−0
- testsrc/Tests.hs +13/−17
- testsrc/runtests.hs +2/−15
- winbuild.bat +0/−4
+ CHANGELOG.md view
@@ -0,0 +1,36 @@+### 1.3.2.0++_2025-08-30, Andreas Abel_++- Drop flag `network--GT-3_0_0` and support for `network < 3`+- Allow newer `time`+- Tested with GHC 8.0 - 9.14 alpha1++#### 1.3.1.2++_2025-03-11, Andreas Abel_++- Thoroughly drop support for GHC 7+- Allow newer `containers`+- Tested with GHC 8.0 - 9.12.1++#### 1.3.1.1++_2024-04-15, Andreas Abel_++- Drop support for GHC 7+- Tested with GHC 8.0 - 9.10++### 1.3.1.0++_2019-10-07, Herbert Valerio Riedel_++- Evaluate message before taking lock in simple handler ([#49](https://github.com/haskell-hvr/hslogger/pull/49))+- Define `Typeable`, `Data`, `Generic` and `NFData` instances for `System.Log.Priority` ([#43](https://github.com/haskell-hvr/hslogger/pull/43))++## 1.3.0.0++_2019-04-15, Herbert Valerio Riedel_++- **[semantic change]** Messages are encoded as UTF-8 (previously the encoding was locale dependent) for the Syslog and Growl backends+- Add support for `network-3.0`; remove redundant dependency on `directory` and `process`
− COPYING
@@ -1,510 +0,0 @@-- GNU LESSER GENERAL PUBLIC LICENSE- Version 2.1, February 1999-- Copyright (C) 1991, 1999 Free Software Foundation, Inc.- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA- Everyone is permitted to copy and distribute verbatim copies- of this license document, but changing it is not allowed.--[This is the first released version of the Lesser GPL. It also counts- as the successor of the GNU Library Public License, version 2, hence- the version number 2.1.]-- Preamble-- The licenses for most software are designed to take away your-freedom to share and change it. By contrast, the GNU General Public-Licenses are intended to guarantee your freedom to share and change-free software--to make sure the software is free for all its users.-- This license, the Lesser General Public License, applies to some-specially designated software packages--typically libraries--of the-Free Software Foundation and other authors who decide to use it. You-can use it too, but we suggest you first think carefully about whether-this license or the ordinary General Public License is the better-strategy to use in any particular case, based on the explanations-below.-- When we speak of free software, we are referring to freedom of use,-not price. Our General Public Licenses are designed to make sure that-you have the freedom to distribute copies of free software (and charge-for this service if you wish); that you receive source code or can get-it if you want it; that you can change the software and use pieces of-it in new free programs; and that you are informed that you can do-these things.-- To protect your rights, we need to make restrictions that forbid-distributors to deny you these rights or to ask you to surrender these-rights. These restrictions translate to certain responsibilities for-you if you distribute copies of the library or if you modify it.-- For example, if you distribute copies of the library, whether gratis-or for a fee, you must give the recipients all the rights that we gave-you. You must make sure that they, too, receive or can get the source-code. If you link other code with the library, you must provide-complete object files to the recipients, so that they can relink them-with the library after making changes to the library and recompiling-it. And you must show them these terms so they know their rights.-- We protect your rights with a two-step method: (1) we copyright the-library, and (2) we offer you this license, which gives you legal-permission to copy, distribute and/or modify the library.-- To protect each distributor, we want to make it very clear that-there is no warranty for the free library. Also, if the library is-modified by someone else and passed on, the recipients should know-that what they have is not the original version, so that the original-author's reputation will not be affected by problems that might be-introduced by others.-- Finally, software patents pose a constant threat to the existence of-any free program. We wish to make sure that a company cannot-effectively restrict the users of a free program by obtaining a-restrictive license from a patent holder. Therefore, we insist that-any patent license obtained for a version of the library must be-consistent with the full freedom of use specified in this license.-- Most GNU software, including some libraries, is covered by the-ordinary GNU General Public License. This license, the GNU Lesser-General Public License, applies to certain designated libraries, and-is quite different from the ordinary General Public License. We use-this license for certain libraries in order to permit linking those-libraries into non-free programs.-- When a program is linked with a library, whether statically or using-a shared library, the combination of the two is legally speaking a-combined work, a derivative of the original library. The ordinary-General Public License therefore permits such linking only if the-entire combination fits its criteria of freedom. The Lesser General-Public License permits more lax criteria for linking other code with-the library.-- We call this license the "Lesser" General Public License because it-does Less to protect the user's freedom than the ordinary General-Public License. It also provides other free software developers Less-of an advantage over competing non-free programs. These disadvantages-are the reason we use the ordinary General Public License for many-libraries. However, the Lesser license provides advantages in certain-special circumstances.-- For example, on rare occasions, there may be a special need to-encourage the widest possible use of a certain library, so that it-becomes a de-facto standard. To achieve this, non-free programs must-be allowed to use the library. A more frequent case is that a free-library does the same job as widely used non-free libraries. In this-case, there is little to gain by limiting the free library to free-software only, so we use the Lesser General Public License.-- In other cases, permission to use a particular library in non-free-programs enables a greater number of people to use a large body of-free software. For example, permission to use the GNU C Library in-non-free programs enables many more people to use the whole GNU-operating system, as well as its variant, the GNU/Linux operating-system.-- Although the Lesser General Public License is Less protective of the-users' freedom, it does ensure that the user of a program that is-linked with the Library has the freedom and the wherewithal to run-that program using a modified version of the Library.-- The precise terms and conditions for copying, distribution and-modification follow. Pay close attention to the difference between a-"work based on the library" and a "work that uses the library". The-former contains code derived from the library, whereas the latter must-be combined with the library in order to run.-- GNU LESSER GENERAL PUBLIC LICENSE- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION-- 0. This License Agreement applies to any software library or other-program which contains a notice placed by the copyright holder or-other authorized party saying it may be distributed under the terms of-this Lesser General Public License (also called "this License").-Each licensee is addressed as "you".-- A "library" means a collection of software functions and/or data-prepared so as to be conveniently linked with application programs-(which use some of those functions and data) to form executables.-- The "Library", below, refers to any such software library or work-which has been distributed under these terms. A "work based on the-Library" means either the Library or any derivative work under-copyright law: that is to say, a work containing the Library or a-portion of it, either verbatim or with modifications and/or translated-straightforwardly into another language. (Hereinafter, translation is-included without limitation in the term "modification".)-- "Source code" for a work means the preferred form of the work for-making modifications to it. For a library, complete source code means-all the source code for all modules it contains, plus any associated-interface definition files, plus the scripts used to control-compilation and installation of the library.-- Activities other than copying, distribution and modification are not-covered by this License; they are outside its scope. The act of-running a program using the Library is not restricted, and output from-such a program is covered only if its contents constitute a work based-on the Library (independent of the use of the Library in a tool for-writing it). Whether that is true depends on what the Library does-and what the program that uses the Library does.-- 1. You may copy and distribute verbatim copies of the Library's-complete source code as you receive it, in any medium, provided that-you conspicuously and appropriately publish on each copy an-appropriate copyright notice and disclaimer of warranty; keep intact-all the notices that refer to this License and to the absence of any-warranty; and distribute a copy of this License along with the-Library.-- You may charge a fee for the physical act of transferring a copy,-and you may at your option offer warranty protection in exchange for a-fee.-- 2. You may modify your copy or copies of the Library or any portion-of it, thus forming a work based on the Library, and copy and-distribute such modifications or work under the terms of Section 1-above, provided that you also meet all of these conditions:-- a) The modified work must itself be a software library.-- b) You must cause the files modified to carry prominent notices- stating that you changed the files and the date of any change.-- c) You must cause the whole of the work to be licensed at no- charge to all third parties under the terms of this License.-- d) If a facility in the modified Library refers to a function or a- table of data to be supplied by an application program that uses- the facility, other than as an argument passed when the facility- is invoked, then you must make a good faith effort to ensure that,- in the event an application does not supply such function or- table, the facility still operates, and performs whatever part of- its purpose remains meaningful.-- (For example, a function in a library to compute square roots has- a purpose that is entirely well-defined independent of the- application. Therefore, Subsection 2d requires that any- application-supplied function or table used by this function must- be optional: if the application does not supply it, the square- root function must still compute square roots.)--These requirements apply to the modified work as a whole. If-identifiable sections of that work are not derived from the Library,-and can be reasonably considered independent and separate works in-themselves, then this License, and its terms, do not apply to those-sections when you distribute them as separate works. But when you-distribute the same sections as part of a whole which is a work based-on the Library, the distribution of the whole must be on the terms of-this License, whose permissions for other licensees extend to the-entire whole, and thus to each and every part regardless of who wrote-it.--Thus, it is not the intent of this section to claim rights or contest-your rights to work written entirely by you; rather, the intent is to-exercise the right to control the distribution of derivative or-collective works based on the Library.--In addition, mere aggregation of another work not based on the Library-with the Library (or with a work based on the Library) on a volume of-a storage or distribution medium does not bring the other work under-the scope of this License.-- 3. You may opt to apply the terms of the ordinary GNU General Public-License instead of this License to a given copy of the Library. To do-this, you must alter all the notices that refer to this License, so-that they refer to the ordinary GNU General Public License, version 2,-instead of to this License. (If a newer version than version 2 of the-ordinary GNU General Public License has appeared, then you can specify-that version instead if you wish.) Do not make any other change in-these notices.-- Once this change is made in a given copy, it is irreversible for-that copy, so the ordinary GNU General Public License applies to all-subsequent copies and derivative works made from that copy.-- This option is useful when you wish to copy part of the code of-the Library into a program that is not a library.-- 4. You may copy and distribute the Library (or a portion or-derivative of it, under Section 2) in object code or executable form-under the terms of Sections 1 and 2 above provided that you accompany-it with the complete corresponding machine-readable source code, which-must be distributed under the terms of Sections 1 and 2 above on a-medium customarily used for software interchange.-- If distribution of object code is made by offering access to copy-from a designated place, then offering equivalent access to copy the-source code from the same place satisfies the requirement to-distribute the source code, even though third parties are not-compelled to copy the source along with the object code.-- 5. A program that contains no derivative of any portion of the-Library, but is designed to work with the Library by being compiled or-linked with it, is called a "work that uses the Library". Such a-work, in isolation, is not a derivative work of the Library, and-therefore falls outside the scope of this License.-- However, linking a "work that uses the Library" with the Library-creates an executable that is a derivative of the Library (because it-contains portions of the Library), rather than a "work that uses the-library". The executable is therefore covered by this License.-Section 6 states terms for distribution of such executables.-- When a "work that uses the Library" uses material from a header file-that is part of the Library, the object code for the work may be a-derivative work of the Library even though the source code is not.-Whether this is true is especially significant if the work can be-linked without the Library, or if the work is itself a library. The-threshold for this to be true is not precisely defined by law.-- If such an object file uses only numerical parameters, data-structure layouts and accessors, and small macros and small inline-functions (ten lines or less in length), then the use of the object-file is unrestricted, regardless of whether it is legally a derivative-work. (Executables containing this object code plus portions of the-Library will still fall under Section 6.)-- Otherwise, if the work is a derivative of the Library, you may-distribute the object code for the work under the terms of Section 6.-Any executables containing that work also fall under Section 6,-whether or not they are linked directly with the Library itself.-- 6. As an exception to the Sections above, you may also combine or-link a "work that uses the Library" with the Library to produce a-work containing portions of the Library, and distribute that work-under terms of your choice, provided that the terms permit-modification of the work for the customer's own use and reverse-engineering for debugging such modifications.-- You must give prominent notice with each copy of the work that the-Library is used in it and that the Library and its use are covered by-this License. You must supply a copy of this License. If the work-during execution displays copyright notices, you must include the-copyright notice for the Library among them, as well as a reference-directing the user to the copy of this License. Also, you must do one-of these things:-- a) Accompany the work with the complete corresponding- machine-readable source code for the Library including whatever- changes were used in the work (which must be distributed under- Sections 1 and 2 above); and, if the work is an executable linked- with the Library, with the complete machine-readable "work that- uses the Library", as object code and/or source code, so that the- user can modify the Library and then relink to produce a modified- executable containing the modified Library. (It is understood- that the user who changes the contents of definitions files in the- Library will not necessarily be able to recompile the application- to use the modified definitions.)-- b) Use a suitable shared library mechanism for linking with the- Library. A suitable mechanism is one that (1) uses at run time a- copy of the library already present on the user's computer system,- rather than copying library functions into the executable, and (2)- will operate properly with a modified version of the library, if- the user installs one, as long as the modified version is- interface-compatible with the version that the work was made with.-- c) Accompany the work with a written offer, valid for at least- three years, to give the same user the materials specified in- Subsection 6a, above, for a charge no more than the cost of- performing this distribution.-- d) If distribution of the work is made by offering access to copy- from a designated place, offer equivalent access to copy the above- specified materials from the same place.-- e) Verify that the user has already received a copy of these- materials or that you have already sent this user a copy.-- For an executable, the required form of the "work that uses the-Library" must include any data and utility programs needed for-reproducing the executable from it. However, as a special exception,-the materials to be distributed need not include anything that is-normally distributed (in either source or binary form) with the major-components (compiler, kernel, and so on) of the operating system on-which the executable runs, unless that component itself accompanies-the executable.-- It may happen that this requirement contradicts the license-restrictions of other proprietary libraries that do not normally-accompany the operating system. Such a contradiction means you cannot-use both them and the Library together in an executable that you-distribute.-- 7. You may place library facilities that are a work based on the-Library side-by-side in a single library together with other library-facilities not covered by this License, and distribute such a combined-library, provided that the separate distribution of the work based on-the Library and of the other library facilities is otherwise-permitted, and provided that you do these two things:-- a) Accompany the combined library with a copy of the same work- based on the Library, uncombined with any other library- facilities. This must be distributed under the terms of the- Sections above.-- b) Give prominent notice with the combined library of the fact- that part of it is a work based on the Library, and explaining- where to find the accompanying uncombined form of the same work.-- 8. You may not copy, modify, sublicense, link with, or distribute-the Library except as expressly provided under this License. Any-attempt otherwise to copy, modify, sublicense, link with, or-distribute the Library is void, and will automatically terminate your-rights under this License. However, parties who have received copies,-or rights, from you under this License will not have their licenses-terminated so long as such parties remain in full compliance.-- 9. You are not required to accept this License, since you have not-signed it. However, nothing else grants you permission to modify or-distribute the Library or its derivative works. These actions are-prohibited by law if you do not accept this License. Therefore, by-modifying or distributing the Library (or any work based on the-Library), you indicate your acceptance of this License to do so, and-all its terms and conditions for copying, distributing or modifying-the Library or works based on it.-- 10. Each time you redistribute the Library (or any work based on the-Library), the recipient automatically receives a license from the-original licensor to copy, distribute, link with or modify the Library-subject to these terms and conditions. You may not impose any further-restrictions on the recipients' exercise of the rights granted herein.-You are not responsible for enforcing compliance by third parties with-this License.-- 11. If, as a consequence of a court judgment or allegation of patent-infringement or for any other reason (not limited to patent issues),-conditions are imposed on you (whether by court order, agreement or-otherwise) that contradict the conditions of this License, they do not-excuse you from the conditions of this License. If you cannot-distribute so as to satisfy simultaneously your obligations under this-License and any other pertinent obligations, then as a consequence you-may not distribute the Library at all. For example, if a patent-license would not permit royalty-free redistribution of the Library by-all those who receive copies directly or indirectly through you, then-the only way you could satisfy both it and this License would be to-refrain entirely from distribution of the Library.--If any portion of this section is held invalid or unenforceable under-any particular circumstance, the balance of the section is intended to-apply, and the section as a whole is intended to apply in other-circumstances.--It is not the purpose of this section to induce you to infringe any-patents or other property right claims or to contest validity of any-such claims; this section has the sole purpose of protecting the-integrity of the free software distribution system which is-implemented by public license practices. Many people have made-generous contributions to the wide range of software distributed-through that system in reliance on consistent application of that-system; it is up to the author/donor to decide if he or she is willing-to distribute software through any other system and a licensee cannot-impose that choice.--This section is intended to make thoroughly clear what is believed to-be a consequence of the rest of this License.-- 12. If the distribution and/or use of the Library is restricted in-certain countries either by patents or by copyrighted interfaces, the-original copyright holder who places the Library under this License-may add an explicit geographical distribution limitation excluding those-countries, so that distribution is permitted only in or among-countries not thus excluded. In such case, this License incorporates-the limitation as if written in the body of this License.-- 13. The Free Software Foundation may publish revised and/or new-versions of the Lesser General Public License from time to time.-Such new versions will be similar in spirit to the present version,-but may differ in detail to address new problems or concerns.--Each version is given a distinguishing version number. If the Library-specifies a version number of this License which applies to it and-"any later version", you have the option of following the terms and-conditions either of that version or of any later version published by-the Free Software Foundation. If the Library does not specify a-license version number, you may choose any version ever published by-the Free Software Foundation.-- 14. If you wish to incorporate parts of the Library into other free-programs whose distribution conditions are incompatible with these,-write to the author to ask for permission. For software which is-copyrighted by the Free Software Foundation, write to the Free-Software Foundation; we sometimes make exceptions for this. Our-decision will be guided by the two goals of preserving the free status-of all derivatives of our free software and of promoting the sharing-and reuse of software generally.-- NO WARRANTY-- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.-- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH-DAMAGES.-- END OF TERMS AND CONDITIONS-- How to Apply These Terms to Your New Libraries-- If you develop a new library, and you want it to be of the greatest-possible use to the public, we recommend making it free software that-everyone can redistribute and change. You can do so by permitting-redistribution under these terms (or, alternatively, under the terms-of the ordinary General Public License).-- To apply these terms, attach the following notices to the library.-It is safest to attach them to the start of each source file to most-effectively convey the exclusion of warranty; and each file should-have at least the "copyright" line and a pointer to where the full-notice is found.--- <one line to give the library's name and a brief idea of what it does.>- Copyright (C) <year> <name of author>-- This library is free software; you can redistribute it and/or- modify it under the terms of the GNU Lesser General Public- License as published by the Free Software Foundation; either- version 2.1 of the License, or (at your option) any later version.-- This library is distributed in the hope that it will be useful,- but WITHOUT ANY WARRANTY; without even the implied warranty of- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU- Lesser General Public License for more details.-- You should have received a copy of the GNU Lesser General Public- License along with this library; if not, write to the Free Software- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA--Also add information on how to contact you by electronic and paper mail.--You should also get your employer (if you work as a programmer) or-your school, if any, to sign a "copyright disclaimer" for the library,-if necessary. Here is a sample; alter the names:-- Yoyodyne, Inc., hereby disclaims all copyright interest in the- library `Frob' (a library for tweaking knobs) written by James- Random Hacker.-- <signature of Ty Coon>, 1 April 1990- Ty Coon, President of Vice--That's all there is to it!--
− COPYRIGHT
@@ -1,25 +0,0 @@-hslogger-Copyright (C) 2004-2006 John Goerzen <jgoerzen@complete.org>--All code is under the following license unless otherwise noted:- This program is free software; you can redistribute it and/or modify- it under the terms of the GNU Lesser General Public License as published by- the Free Software Foundation; either version 2.1 of the License, or- (at your option) any later version.-- This program is distributed in the hope that it will be useful,- but WITHOUT ANY WARRANTY; without even the implied warranty of- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the- GNU Lesser General Public License for more details.-- You should have received a copy of the GNU General Public License- along with this program; if not, write to the Free Software- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA--The GNU General Public License is available in the file COPYING in the source-distribution. Debian GNU/Linux users may find this in-/usr/share/common-licenses/LGPL-2.1.--If the LGPL is unacceptable for your uses, please e-mail me; alternative-terms can be negotiated for your project.-
+ LICENSE view
@@ -0,0 +1,27 @@+Copyright (c) 2004 - 2011 John Goerzen+All rights reserved.++Redistribution and use in source and binary forms, with or without+modification, are permitted provided that the following conditions are met:++* Redistributions of source code must retain the above copyright notice, this+ list of conditions and the following disclaimer.++* Redistributions in binary form must reproduce the above copyright notice, this+ list of conditions and the following disclaimer in the documentation and/or+ other materials provided with the distribution.++* Neither the name of John Goerzen nor the names of the+ contributors may be used to endorse or promote products derived from this+ software without specific prior written permission.++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
− Setup.hs
@@ -1,5 +0,0 @@-#!/usr/bin/env runhaskell--import Distribution.Simple--main = defaultMain
hslogger.cabal view
@@ -1,64 +1,100 @@-Name: hslogger-Version: 1.0.12-License: LGPL-Maintainer: John Goerzen <jgoerzen@complete.org>-Author: John Goerzen-Stability: Stable-Copyright: Copyright (c) 2004-2010 John Goerzen-license-file: COPYRIGHT+cabal-version: 1.18 build-type: Simple-Homepage: http://software.complete.org/hslogger-Synopsis: Versatile logging framework-Description: hslogger is a logging framework for Haskell, roughly similar to- Python's logging module.+name: hslogger+version: 1.3.2.0++maintainer: https://github.com/haskell-hvr/hslogger+author: John Goerzen+copyright: Copyright (c) 2004-2018 John Goerzen+ , (c) 2019 Herbert Valerio Riedel+license: BSD3+license-file: LICENSE+homepage: https://github.com/haskell-hvr/hslogger/wiki+bug-reports: https://github.com/haskell-hvr/hslogger/issues+category: Interfaces+synopsis: Versatile logging framework+description:+ @hslogger@ is a logging framework for Haskell, roughly similar+ to [Python's logging module](https://docs.python.org/2/library/logging.html). .- hslogger lets each log message have a priority and source be associated+ @hslogger@ lets each log message have a priority and source be associated with it. The programmer can then define global handlers that route- or filter messages based on the priority and source. hslogger also- has a syslog handler built in.-Category: Interfaces-extra-source-files: COPYING,- contrib/java/build.xml,- contrib/java/hslogger4j.jar,- contrib/java/hslogger4j-plugins.xml,- contrib/java/org/haskell/hslogger/HsloggerLevel.java,- contrib/java/org/haskell/hslogger/LogFileXMLReceiver.java,- contrib/java/org/haskell/hslogger/XMLDecoder.java,- testsrc/Tests.hs,- testsrc/runtests.hs,- winbuild.bat-Cabal-Version: >= 1.2+ or filter messages based on the priority and source. @hslogger@ also+ has a [Syslog](https://tools.ietf.org/html/rfc5424) handler built in. -flag small_base- description: choose the new smaller, split-up base package.-flag buildtests- description: Build the executable to run unit tests- default: False+extra-doc-files:+ LICENSE+ CHANGELOG.md -Library- Exposed-Modules: - System.Log, System.Log.Handler,- System.Log.Handler.Simple, System.Log.Handler.Syslog,- System.Log.Handler.Growl, System.Log.Handler.Log4jXML,+extra-source-files:+ contrib/java/build.xml+ contrib/java/hslogger4j.jar+ contrib/java/hslogger4j-plugins.xml+ contrib/java/org/haskell/hslogger/HsloggerLevel.java+ contrib/java/org/haskell/hslogger/LogFileXMLReceiver.java+ contrib/java/org/haskell/hslogger/XMLDecoder.java+ testsrc/Tests.hs+ testsrc/runtests.hs++tested-with:+ GHC == 9.14.1+ GHC == 9.12.2+ GHC == 9.10.2+ GHC == 9.8.4+ GHC == 9.6.7+ GHC == 9.4.8+ GHC == 9.2.8+ GHC == 9.0.2+ GHC == 8.10.7+ GHC == 8.8.4+ GHC == 8.6.5+ GHC == 8.4.4+ GHC == 8.2.2+ GHC == 8.0.2++source-repository head+ type: git+ location: http://github.com/haskell-hvr/hslogger.git++library+ hs-source-dirs: src+ exposed-modules:+ System.Log+ System.Log.Handler+ System.Log.Formatter+ System.Log.Handler.Simple+ System.Log.Handler.Syslog+ System.Log.Handler.Growl+ System.Log.Handler.Log4jXML System.Log.Logger- Extensions: CPP, ExistentialQuantification- Build-Depends: network, mtl+ other-modules:+ UTF8++ default-language: Haskell2010+ other-extensions: CPP ExistentialQuantification DeriveDataTypeable++ build-depends:+ -- Lower bounds are at least the ones from LTS 7.24 (GHC 8.0.1)+ base >= 4.9 && < 5+ , bytestring >= 0.10.8.1 && < 0.13+ , containers >= 0.5.7.1 && < 1+ , deepseq >= 1.4.2.0 && < 1.6+ , time >= 1.6.0.1 && < 2+ , network-bsd >= 2.8.1 && <2.9+ , network >= 3.0 && <3.3+ if !os(windows)- Build-Depends: unix- if flag(small_base)- build-depends: base >= 4 && < 5, containers, directory, process,- time, old-locale- else- build-depends: base < 3, time- GHC-Options: -O2- Hs-Source-Dirs: src+ Build-Depends: unix >= 2.7.2.0 && < 2.9 -Executable runtests- if flag(buildtests)- Buildable: True- else- Buildable: False- Main-Is: runtests.hs- HS-Source-Dirs: testsrc, .- Extensions: ExistentialQuantification, OverlappingInstances,- UndecidableInstances, CPP+test-suite runtests+ type: exitcode-stdio-1.0++ hs-source-dirs: testsrc+ main-is: runtests.hs+ other-modules: Tests++ default-language: Haskell2010+ build-depends:+ base+ , HUnit == 1.6.*+ , hslogger
src/System/Log.hs view
@@ -1,28 +1,12 @@-{- arch-tag: Logging Main Definition-Copyright (C) 2004 John Goerzen <jgoerzen@complete.org>--This program is free software; you can redistribute it and/or modify-it under the terms of the GNU Lesser General Public License as published by-the Free Software Foundation; either version 2.1 of the License, or-(at your option) any later version.--This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU Lesser General Public License for more details.--You should have received a copy of the GNU Lesser General Public License-along with this program; if not, write to the Free Software-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA--}+{-# LANGUAGE CPP #-}+{-# LANGUAGE DeriveDataTypeable #-}+{-# LANGUAGE DeriveGeneric #-} {- | Module : System.Log- Copyright : Copyright (C) 2004 John Goerzen- License : GNU LGPL, version 2.1 or above+ Copyright : Copyright (C) 2004-2011 John Goerzen+ License : BSD3 - Maintainer : John Goerzen <jgoerzen@complete.org> - Stability : experimental Portability: portable Haskell Logging Framework@@ -45,7 +29,11 @@ where -{- | Priorities are used to define how important a log messgae is.+import Control.DeepSeq (NFData(rnf))+import Data.Data (Data, Typeable)+import GHC.Generics (Generic)++{- | Priorities are used to define how important a log message is. Users can filter log messages based on priorities. These have their roots on the traditional syslog system. The standard@@ -53,7 +41,7 @@ like. They are listed here in ascending importance order. -} -data Priority = +data Priority = DEBUG -- ^ Debug messages | INFO -- ^ Information | NOTICE -- ^ Normal runtime conditions@@ -62,9 +50,11 @@ | CRITICAL -- ^ Severe situations | ALERT -- ^ Take immediate action | EMERGENCY -- ^ System is unusable- deriving (Eq, Ord, Show, Read)+ deriving (Eq, Ord, Enum, Bounded, Show, Read, Data, Typeable, Generic) +-- | @since 1.3.1.0+instance NFData Priority where rnf = (`seq` ())+ {- | Internal type of log records -} type LogRecord = (Priority, String)-
+ src/System/Log/Formatter.hs view
@@ -0,0 +1,113 @@+{-# LANGUAGE CPP #-}++{-+Copyright (c) 2005-2011 John Goerzen+License: BSD3+-}+{- |++Definition of log formatter support++A few basic, and extendable formatters are defined.+++Please see "System.Log.Logger" for extensive documentation on the+logging system.++-}+++module System.Log.Formatter( LogFormatter+ , nullFormatter+ , simpleLogFormatter+ , tfLogFormatter+ , varFormatter+ ) where+import Data.List+import Control.Applicative ((<$>))+import Control.Concurrent (myThreadId)+#ifndef mingw32_HOST_OS+import System.Posix.Process (getProcessID)+#endif++import Data.Time.Format (defaultTimeLocale)+import Data.Time (getZonedTime,getCurrentTime,formatTime)++import System.Log++-- | A LogFormatter is used to format log messages. Note that it is paramterized on the+-- 'Handler' to allow the formatter to use information specific to the handler+-- (an example of can be seen in the formatter used in 'System.Log.Handler.Syslog')+type LogFormatter a = a -- ^ The LogHandler that the passed message came from+ -> LogRecord -- ^ The log message and priority+ -> String -- ^ The logger name+ -> IO String -- ^ The formatted log message++-- | Returns the passed message as is, ie. no formatting is done.+nullFormatter :: LogFormatter a+nullFormatter _ (_,msg) _ = return msg++-- | Takes a format string, and returns a formatter that may be used to+-- format log messages. The format string may contain variables prefixed with+-- a $-sign which will be replaced at runtime with corresponding values. The+-- currently supported variables are:+--+-- * @$msg@ - The actual log message+--+-- * @$loggername@ - The name of the logger+--+-- * @$prio@ - The priority level of the message+--+-- * @$tid@ - The thread ID+--+-- * @$pid@ - Process ID (Not available on windows)+--+-- * @$time@ - The current time+--+-- * @$utcTime@ - The current time in UTC Time+simpleLogFormatter :: String -> LogFormatter a+simpleLogFormatter format h (prio, msg) loggername =+ tfLogFormatter "%F %X %Z" format h (prio,msg) loggername++-- | Like 'simpleLogFormatter' but allow the time format to be specified in the first+-- parameter (this is passed to 'Date.Time.Format.formatTime')+tfLogFormatter :: String -> String -> LogFormatter a+tfLogFormatter timeFormat format = do+ varFormatter [("time", formatTime defaultTimeLocale timeFormat <$> getZonedTime)+ ,("utcTime", formatTime defaultTimeLocale timeFormat <$> getCurrentTime)+ ]+ format++-- | An extensible formatter that allows new substition /variables/ to be defined.+-- Each variable has an associated IO action that is used to produce the+-- string to substitute for the variable name. The predefined variables are the same+-- as for 'simpleLogFormatter' /excluding/ @$time@ and @$utcTime@.+varFormatter :: [(String, IO String)] -> String -> LogFormatter a+varFormatter vars format _h (prio,msg) loggername = do+ outmsg <- replaceVarM (vars++[("msg", return msg)+ ,("prio", return $ show prio)+ ,("loggername", return loggername)+ ,("tid", show <$> myThreadId)+#ifndef mingw32_HOST_OS+ ,("pid", show <$> getProcessID)+#endif+ ]+ )+ format+ return outmsg+++-- | Replace some '$' variables in a string with supplied values+replaceVarM :: [(String, IO String)] -- ^ A list of (variableName, action to get the replacement string) pairs+ -> String -- ^ String to perform substitution on+ -> IO String -- ^ Resulting string+replaceVarM _ [] = return []+replaceVarM keyVals (s:ss) | s=='$' = do (f,rest) <- replaceStart keyVals ss+ repRest <- replaceVarM keyVals rest+ return $ f ++ repRest+ | otherwise = replaceVarM keyVals ss >>= return . (s:)+ where+ replaceStart [] str = return ("$",str)+ replaceStart ((k,v):kvs) str | k `isPrefixOf` str = do vs <- v+ return (vs, drop (length k) str)+ | otherwise = replaceStart kvs str
src/System/Log/Handler.hs view
@@ -1,28 +1,8 @@-{- arch-tag: Log handlers main definition-Copyright (C) 2004-2006 John Goerzen <jgoerzen@complete.org>--This program is free software; you can redistribute it and/or modify-it under the terms of the GNU Lesser General Public License as published by-the Free Software Foundation; either version 2.1 of the License, or-(at your option) any later version.--This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU Lesser General Public License for more details.--You should have received a copy of the GNU Lesser General Public License-along with this program; if not, write to the Free Software-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA--}- {- | Module : System.Log.Handler- Copyright : Copyright (C) 2004-2006 John Goerzen- License : GNU LGPL, version 2.1 or above+ Copyright : Copyright (C) 2004-2011 John Goerzen+ License : BSD3 - Maintainer : John Goerzen <jgoerzen@complete.org> - Stability : provisional Portability: portable Definition of log handler support@@ -40,7 +20,7 @@ LogHandler(..) ) where import System.Log-import System.IO+import System.Log.Formatter {- | All log handlers should adhere to this. -} @@ -53,13 +33,18 @@ setLevel :: a -> Priority -> a -- | Gets the current level. getLevel :: a -> Priority+ -- | Set a log formatter to customize the log format for this Handler+ setFormatter :: a -> LogFormatter a -> a+ getFormatter :: a -> LogFormatter a+ getFormatter _ = nullFormatter -- | Logs an event if it meets the requirements -- given by the most recent call to 'setLevel'. handle :: a -> LogRecord -> String-> IO () - handle h (pri, msg) logname = + handle h (pri, msg) logname = if pri >= (getLevel h)- then emit h (pri, msg) logname+ then do formattedMsg <- (getFormatter h) h (pri,msg) logname+ emit h (pri, formattedMsg) logname else return () -- | Forces an event to be logged regardless of -- the configured level.@@ -67,6 +52,3 @@ -- | Closes the logging system, causing it to close -- any open files, etc. close :: a -> IO ()---
src/System/Log/Handler/Growl.hs view
@@ -1,28 +1,8 @@-{- arch-tag: Growl log handlers-Copyright (C) 2007 John Goerzen <jgoerzen@complete.org>--This program is free software; you can redistribute it and/or modify-it under the terms of the GNU Lesser General Public License as published by-the Free Software Foundation; either version 2.1 of the License, or-(at your option) any later version.--This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU Lesser General Public License for more details.--You should have received a copy of the GNU Lesser General Public License-along with this program; if not, write to the Free Software-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA--}- {- | Module : System.Log.Handler.Growl- Copyright : Copyright (C) 2007 John Goerzen <jgoerzen@complete.org>- License : GNU LGPL, version 2.1 or above+ Copyright : Copyright (C) 2007-2011 John Goerzen <jgoerzen@complete.org>+ License : BSD3 - Maintainer : Richard M. Neswold, Jr. <rich.neswold@gmail.com>- Stability : provisional Portability: portable Simple log handlers@@ -35,15 +15,23 @@ import Data.Char import Data.Word-import Network.Socket-import Network.BSD+import qualified Network.Socket as S+import qualified Network.Socket.ByteString as SBS+import qualified Network.BSD as S import System.Log import System.Log.Handler+import System.Log.Formatter +import UTF8++sendTo :: S.Socket -> String -> S.SockAddr -> IO Int+sendTo s str = SBS.sendTo s (toUTF8BS str)+ data GrowlHandler = GrowlHandler { priority :: Priority,+ formatter :: LogFormatter GrowlHandler, appName :: String,- skt :: Socket,- targets :: [HostAddress] }+ skt :: S.Socket,+ targets :: [S.HostAddress] } instance LogHandler GrowlHandler where @@ -51,16 +39,19 @@ getLevel = priority + setFormatter gh f = gh { formatter = f }+ getFormatter = formatter+ emit gh lr _ = let pkt = buildNotification gh nmGeneralMsg lr- in mapM_ (sendNote (skt gh) pkt) (targets gh)+ in mapM_ (sendNote (skt gh) pkt) (targets gh) close gh = let pkt = buildNotification gh nmClosingMsg- (WARNING, "Connection closing.")+ (WARNING, "Connection closing.") s = skt gh- in mapM_ (sendNote s pkt) (targets gh) >> sClose s+ in mapM_ (sendNote s pkt) (targets gh) >> S.close s -sendNote :: Socket -> String -> HostAddress -> IO Int-sendNote s pkt ha = sendTo s pkt (SockAddrInet 9887 ha)+sendNote :: S.Socket -> String -> S.HostAddress -> IO Int+sendNote s pkt ha = sendTo s pkt (S.SockAddrInet 9887 ha) -- Right now there are two "notification names": "message" and -- "disconnecting". All log messages are sent using the "message"@@ -80,8 +71,8 @@ -> Priority -- ^ Priority of handler -> IO GrowlHandler growlHandler nm pri =- do { s <- socket AF_INET Datagram 0- ; return GrowlHandler { priority = pri, appName = nm,+ do { s <- S.socket S.AF_INET S.Datagram 0+ ; return GrowlHandler { priority = pri, appName = nm, formatter=nullFormatter, skt = s, targets = [] } } @@ -107,7 +98,7 @@ foldl packIt [] appNotes, ['\x0' .. (chr (length appNotes - 1))] ] packIt a b = a ++ (emitLen16 b) ++ b- appNotes = [ nmGeneralMsg, nmClosingMsg ]+ appNotes = [ nmGeneralMsg, nmClosingMsg ] emitLen8 v = [chr $ length v] {- | Adds a remote machine's address to the list of targets that will@@ -115,11 +106,11 @@ packet to the machine. This function will throw an exception if the host name cannot be found. -} -addTarget :: HostName -> GrowlHandler -> IO GrowlHandler-addTarget hn gh = do { he <- getHostByName hn- ; let ha = hostAddress he- sa = SockAddrInet 9887 ha- in do { sendTo (skt gh) (buildRegistration gh) sa+addTarget :: S.HostName -> GrowlHandler -> IO GrowlHandler+addTarget hn gh = do { he <- S.getHostByName hn+ ; let ha = S.hostAddress he+ sa = S.SockAddrInet 9887 ha+ in do { _ <- sendTo (skt gh) (buildRegistration gh) sa ; return gh { targets = ha:(targets gh) } } } -- Converts a Priority type into the subset of integers needed in the@@ -138,9 +129,9 @@ -- Creates a network packet containing a notification record. buildNotification :: GrowlHandler- -> String+ -> String -> LogRecord- -> String+ -> String buildNotification gh nm (p, msg) = concat fields where fields = [ ['\x1', '\x5'], emit16 (toFlags p),
src/System/Log/Handler/Log4jXML.hs view
@@ -1,28 +1,9 @@-{- arch-tag: log4j XMLLayout log handler-Copyright (C) 2007-2008 John Goerzen <jgoerzen@complete.org>--This program is free software; you can redistribute it and/or modify-it under the terms of the GNU Lesser General Public License as published by-the Free Software Foundation; either version 2.1 of the License, or-(at your option) any later version.--This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU Lesser General Public License for more details.--You should have received a copy of the GNU Lesser General Public License-along with this program; if not, write to the Free Software-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA--}-+{-# LANGUAGE CPP #-} {- | Module : System.Log.Handler.Log4jXML- Copyright : Copyright (C) 2007-2008 John Goerzen- License : GNU LGPL, version 2.1 or above+ Copyright : Copyright (C) 2007-2011 John Goerzen+ License : BSD3 - Maintainer : bjorn.buckwalter@gmail.com- Stability : experimental Portability: GHC only? log4j[1] XMLLayout log handlers.@@ -31,8 +12,8 @@ -} -module System.Log.Handler.Log4jXML ( - +module System.Log.Handler.Log4jXML (+ -- * Introduction {- | This module provides handlers for hslogger that are@@ -52,10 +33,10 @@ 'System.Log.Handler.Simple.FileHandler' in "System.Log.Handler.Simple". The following handlers are provided: -} - -- ** Handlers with hslogger levels + -- ** Handlers with hslogger levels log4jStreamHandler, log4jFileHandler,- + -- ** Handlers with log4j levels log4jStreamHandler', log4jFileHandler'@@ -123,41 +104,36 @@ ) where -import Control.Concurrent (ThreadId, myThreadId) -- myThreadId is GHC only!-import Control.Concurrent.MVar+import Control.Concurrent (myThreadId) -- myThreadId is GHC only! import Data.List (isPrefixOf) import System.IO-import System.Locale (defaultTimeLocale)+import Data.Time.Format (defaultTimeLocale) import Data.Time import System.Log-import System.Log.Handler.Simple (GenericHandler (..))+import System.Log.Handler+import System.Log.Handler.Simple (streamHandler, GenericHandler(..)) -- Handler that logs to a handle rendering message priorities according -- to the supplied function. log4jHandler :: (Priority -> String) -> Handle -> Priority -> IO (GenericHandler Handle) log4jHandler showPrio h pri = do- lock <- newMVar ()- let mywritefunc hdl (prio, msg) loggername = withMVar lock (\_ -> do- time <- getCurrentTime- thread <- myThreadId- hPutStrLn hdl (show $ createMessage loggername time prio thread msg)- hFlush hdl- )- return (GenericHandler { priority = pri,- privData = h,- writeFunc = mywritefunc,- closeFunc = \x -> return () })- where- -- Creates an XML element representing a log4j event/message.- createMessage :: String -> UTCTime -> Priority -> ThreadId -> String -> XML- createMessage logger time prio thread msg = Elem "log4j:event"- [ ("logger" , logger )- , ("timestamp", millis time )- , ("level" , showPrio prio)- , ("thread" , show thread )- ]- (Just $ Elem "log4j:message" [] (Just $ CDATA msg))+ hndlr <- streamHandler h pri+ return $ setFormatter hndlr xmlFormatter++ where+ -- A Log Formatter that creates an XML element representing a log4j event/message.+ xmlFormatter :: a -> (Priority,String) -> String -> IO String+ xmlFormatter _ (prio,msg) logger = do+ time <- getCurrentTime+ thread <- myThreadId+ return . show $ Elem "log4j:event"+ [ ("logger" , logger )+ , ("timestamp", millis time )+ , ("level" , showPrio prio)+ , ("thread" , show thread )+ ]+ (Just $ Elem "log4j:message" [] (Just $ CDATA msg)) where -- This is an ugly hack to get a unix epoch with milliseconds. -- The use of "take 3" causes the milliseconds to always be@@ -239,4 +215,3 @@ replace _ _ [ ] = [] replace from to xs@(a:as) = if isPrefixOf from xs then to ++ drop (length from) xs else a : replace from to as-
src/System/Log/Handler/Simple.hs view
@@ -1,28 +1,8 @@-{- arch-tag: Simple log handlers-Copyright (C) 2004-2006 John Goerzen <jgoerzen@complete.org>--This program is free software; you can redistribute it and/or modify-it under the terms of the GNU Lesser General Public License as published by-the Free Software Foundation; either version 2.1 of the License, or-(at your option) any later version.--This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU Lesser General Public License for more details.--You should have received a copy of the GNU Lesser General Public License-along with this program; if not, write to the Free Software-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA--}- {- | Module : System.Log.Handler.Simple- Copyright : Copyright (C) 2004-2006 John Goerzen- License : GNU LGPL, version 2.1 or above+ Copyright : Copyright (C) 2004-2011 John Goerzen+ License : BSD3 - Maintainer : John Goerzen <jgoerzen@complete.org> - Stability : provisional Portability: portable Simple log handlers@@ -35,26 +15,31 @@ verboseStreamHandler) where -import Prelude hiding (catch)-import Control.Exception (SomeException, catch)+import Control.Exception (tryJust)+import Control.DeepSeq import Data.Char (ord) import System.Log import System.Log.Handler+import System.Log.Formatter import System.IO+import System.IO.Error import Control.Concurrent.MVar {- | A helper data type. -} data GenericHandler a = GenericHandler {priority :: Priority,+ formatter :: LogFormatter (GenericHandler a), privData :: a,- writeFunc :: a -> LogRecord -> String -> IO (),+ writeFunc :: a -> String -> IO (), closeFunc :: a -> IO () } instance LogHandler (GenericHandler a) where setLevel sh p = sh{priority = p} getLevel sh = priority sh- emit sh lr loggername = (writeFunc sh) (privData sh) lr loggername+ setFormatter sh f = sh{formatter = f}+ getFormatter sh = formatter sh+ emit sh (_,msg) _ = (writeFunc sh) (privData sh) msg close sh = (closeFunc sh) (privData sh) @@ -66,18 +51,23 @@ streamHandler :: Handle -> Priority -> IO (GenericHandler Handle) streamHandler h pri = do lock <- newMVar ()- let mywritefunc hdl (_, msg) _ =+ let mywritefunc hdl msg =+ msg `deepseq` withMVar lock (\_ -> do writeToHandle hdl msg hFlush hdl ) return (GenericHandler {priority = pri,+ formatter = nullFormatter, privData = h, writeFunc = mywritefunc,- closeFunc = \x -> return ()})+ closeFunc = \_ -> return ()}) where- writeToHandle hdl msg =- hPutStrLn hdl msg `catch` (handleWriteException hdl msg)- handleWriteException :: Handle -> String -> SomeException -> IO ()+ writeToHandle hdl msg = do+ rv <- tryJust myException (hPutStrLn hdl msg)+ either (handleWriteException hdl msg) return rv+ myException e+ | isDoesNotExistError e = Just e+ | otherwise = Nothing handleWriteException hdl msg e = let msg' = "Error writing log message: " ++ show e ++ " (original message: " ++ msg ++ ")"@@ -100,16 +90,6 @@ {- | Like 'streamHandler', but note the priority and logger name along with each message. -} verboseStreamHandler :: Handle -> Priority -> IO (GenericHandler Handle)-verboseStreamHandler h pri =- do lock <- newMVar ()- let mywritefunc hdl (prio, msg) loggername = - withMVar lock (\_ -> do hPutStrLn hdl ("[" ++ loggername - ++ "/" ++- show prio ++- "] " ++ msg)- hFlush hdl- )- return (GenericHandler {priority = pri,- privData = h,- writeFunc = mywritefunc,- closeFunc = \x -> return ()})+verboseStreamHandler h pri = let fmt = simpleLogFormatter "[$loggername/$prio] $msg"+ in do hndlr <- streamHandler h pri+ return $ setFormatter hndlr fmt
src/System/Log/Handler/Syslog.hs view
@@ -1,29 +1,10 @@ {-# LANGUAGE CPP #-}-{- arch-tag: Syslog handler-Copyright (C) 2004-2006 John Goerzen <jgoerzen@complete.org> -This program is free software; you can redistribute it and/or modify-it under the terms of the GNU Lesser General Public License as published by-the Free Software Foundation; either version 2.1 of the License, or-(at your option) any later version.--This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU Lesser General Public License for more details.--You should have received a copy of the GNU Lesser General Public License-along with this program; if not, write to the Free Software-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA--}- {- | Module : System.Log.Handler.Syslog- Copyright : Copyright (C) 2004-2006 John Goerzen- License : GNU LGPL, version 2.1 or above+ Copyright : Copyright (C) 2004-2011 John Goerzen+ License : BSD3 - Maintainer : John Goerzen <jgoerzen@complete.org> - Stability : provisional Portability: portable Syslog handler for the Haskell Logging Framework@@ -46,6 +27,7 @@ -} module System.Log.Handler.Syslog(+ SyslogHandler, -- No constructors. -- * Handler Initialization openlog, -- * Advanced handler initialization@@ -59,17 +41,29 @@ Option(..) ) where +import qualified Control.Exception as E import System.Log+import System.Log.Formatter import System.Log.Handler import Data.Bits-import Network.Socket-import Network.BSD-import Data.List+import qualified Network.Socket as S+import qualified Network.Socket.ByteString as SBS+import qualified Network.BSD as S+import Data.List (genericDrop) #ifndef mingw32_HOST_OS import System.Posix.Process(getProcessID) #endif import System.IO+import Control.Monad (void, when) +import UTF8++send :: S.Socket -> String -> IO Int+send s = SBS.send s . toUTF8BS++sendTo :: S.Socket -> String -> S.SockAddr -> IO Int+sendTo s str = SBS.sendTo s (toUTF8BS str)+ code_of_pri :: Priority -> Int code_of_pri p = case p of EMERGENCY -> 0@@ -84,7 +78,7 @@ {- | Facilities are used by the system to determine where messages are sent. -} -data Facility = +data Facility = KERN -- ^ Kernel messages; you should likely never use this in your programs | USER -- ^ General userland messages. Use this if nothing else is appropriate | MAIL -- ^ E-Mail system@@ -145,9 +139,12 @@ data SyslogHandler = SyslogHandler {options :: [Option], facility :: Facility, identity :: String,- logsocket :: Socket,- address :: SockAddr,- priority :: Priority}+ logsocket :: S.Socket,+ address :: S.SockAddr,+ sock_type :: S.SocketType,+ priority :: Priority,+ formatter :: LogFormatter SyslogHandler+ } {- | Initialize the Syslog system using the local system's default interface, \/dev\/log. Will return a new 'System.Log.Handler.LogHandler'.@@ -165,7 +162,9 @@ -> IO SyslogHandler -- ^ Returns the new handler #ifdef mingw32_HOST_OS-openlog = openlog_remote AF_INET "localhost" 514+openlog = openlog_remote S.AF_INET "localhost" 514+#elif darwin_HOST_OS+openlog = openlog_local "/var/run/syslog" #else openlog = openlog_local "/dev/log" #endif@@ -182,76 +181,106 @@ -> Facility -- ^ Facility value -> Priority -- ^ Priority limit -> IO SyslogHandler-openlog_local fifopath ident options fac pri =- do- s <- socket AF_UNIX Datagram 0- openlog_generic s (SockAddrUnix fifopath) ident options fac pri+openlog_local fifopath ident options' fac pri =+ do (s, t) <- do -- "/dev/log" is usually Datagram,+ -- but most of syslog loggers allow it to be+ -- of Stream type. glibc's" openlog()"+ -- does roughly the similar thing:+ -- http://www.gnu.org/software/libc/manual/html_node/openlog.html++ s <- S.socket S.AF_UNIX S.Stream 0+ tryStream s `E.catch` (onIOException (fallbackToDgram s))+ openlog_generic s (S.SockAddrUnix fifopath) t ident options' fac pri++ where onIOException :: IO a -> E.IOException -> IO a+ onIOException a _ = a++ tryStream :: S.Socket -> IO (S.Socket, S.SocketType)+ tryStream s =+ do S.connect s (S.SockAddrUnix fifopath)+ return (s, S.Stream)++ fallbackToDgram :: S.Socket -> IO (S.Socket, S.SocketType)+ fallbackToDgram s =+ do S.close s -- close Stream variant+ d <- S.socket S.AF_UNIX S.Datagram 0+ return (d, S.Datagram) #endif {- | Log to a remote server via UDP. -}-openlog_remote :: Family -- ^ Usually AF_INET or AF_INET6; see Network.Socket- -> HostName -- ^ Remote hostname. Some use @localhost@- -> PortNumber -- ^ 514 is the default for syslog+openlog_remote :: S.Family -- ^ Usually AF_INET or AF_INET6; see Network.Socket+ -> S.HostName -- ^ Remote hostname. Some use @localhost@+ -> S.PortNumber -- ^ 514 is the default for syslog -> String -- ^ Program name -> [Option] -- ^ 'Option's -> Facility -- ^ Facility value -> Priority -- ^ Priority limit -> IO SyslogHandler-openlog_remote fam hostname port ident options fac pri =+openlog_remote fam hostname port ident options' fac pri = do- he <- getHostByName hostname- s <- socket fam Datagram 0- let addr = SockAddrInet port (head (hostAddresses he))- openlog_generic s addr ident options fac pri- + he <- S.getHostByName hostname+ s <- S.socket fam S.Datagram 0+ let addr = S.SockAddrInet port (head (S.hostAddresses he))+ openlog_generic s addr S.Datagram ident options' fac pri+ {- | The most powerful initialization mechanism. Takes an open datagram socket. -}-openlog_generic :: Socket -- ^ A datagram socket- -> SockAddr -- ^ Address for transmissions+openlog_generic :: S.Socket -- ^ A datagram socket+ -> S.SockAddr -- ^ Address for transmissions+ -> S.SocketType -- ^ socket connection mode (stream / datagram) -> String -- ^ Program name -> [Option] -- ^ 'Option's -> Facility -- ^ Facility value -> Priority -- ^ Priority limit -> IO SyslogHandler-openlog_generic sock addr ident opt fac pri =+openlog_generic sock addr sock_t ident opt fac pri = return (SyslogHandler {options = opt, facility = fac, identity = ident, logsocket = sock, address = addr,- priority = pri})+ sock_type = sock_t,+ priority = pri,+ formatter = syslogFormatter+ }) +syslogFormatter :: LogFormatter SyslogHandler+syslogFormatter sh (p,msg) logname =+ let format = "[$loggername/$prio] $msg"+ in varFormatter [] format sh (p,msg) logname++ instance LogHandler SyslogHandler where setLevel sh p = sh{priority = p} getLevel sh = priority sh- emit sh (p, msg) loggername = - let code = makeCode (facility sh) p- getpid :: IO String- getpid = if (elem PID (options sh))- then do+ setFormatter sh f = sh{formatter = f}+ getFormatter sh = formatter sh+ emit sh (prio, msg) _ = do+ when (elem PERROR (options sh)) (hPutStrLn stderr msg)+ pidPart <- getPidPart+ void $ sendstr (toSyslogFormat msg pidPart)+ where+ sendstr :: String -> IO String+ sendstr [] = return []+ sendstr omsg = do+ sent <- case sock_type sh of+ S.Datagram -> sendTo (logsocket sh) omsg (address sh)+ S.Stream -> send (logsocket sh) omsg+ _ -> undefined+ sendstr (genericDrop sent omsg)+ toSyslogFormat msg' pidPart =+ "<" ++ code ++ ">" ++ identity' ++ pidPart ++ ": " ++ msg' ++ "\0"+ code = show $ makeCode (facility sh) prio+ identity' = identity sh+ getPidPart = if elem PID (options sh)+ then getPid >>= \pid -> return ("[" ++ pid ++ "]")+ else return ""+ getPid :: IO String+ getPid = #ifndef mingw32_HOST_OS- pid <- getProcessID+ getProcessID >>= return . show #else- let pid = "windows"+ return "windows" #endif- return ("[" ++ show pid ++ "]")- else return ""- - sendstr :: String -> IO String- sendstr [] = return []- sendstr omsg = do- sent <- sendTo (logsocket sh) omsg (address sh)- sendstr (genericDrop sent omsg)- in- do- pidstr <- getpid- let outstr = "<" ++ (show code) ++ ">" - ++ (identity sh) ++ pidstr ++ ": "- ++ "[" ++ loggername ++ "/" ++ (show p) ++ "] " ++ msg- if (elem PERROR (options sh))- then hPutStrLn stderr outstr- else return ()- sendstr (outstr ++ "\0")- return ()- close sh = sClose (logsocket sh) + close sh = S.close (logsocket sh)
src/System/Log/Logger.hs view
@@ -1,29 +1,10 @@-{-# OPTIONS -fglasgow-exts #-}-{- arch-tag: Logger main definition-Copyright (C) 2004-2009 John Goerzen <jgoerzen@complete.org>--This program is free software; you can redistribute it and/or modify-it under the terms of the GNU Lesser General Public License as published by-the Free Software Foundation; either version 2.1 of the License, or-(at your option) any later version.--This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU Lesser General Public License for more details.--You should have received a copy of the GNU Lesser General Public License-along with this program; if not, write to the Free Software-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA--}+{-# LANGUAGE CPP, ExistentialQuantification #-} {- | Module : System.Log.Logger- Copyright : Copyright (C) 2004-2009 John Goerzen- License : GNU LGPL, version 2.1 or above+ Copyright : Copyright (C) 2004-2011 John Goerzen+ License : BSD3 - Maintainer : John Goerzen <jgoerzen@complete.org> - Stability : provisional Portability: portable Haskell Logging Framework, Primary Interface@@ -41,7 +22,7 @@ Therefore, a 'Logger' named \"foo\" is the parent of loggers \"foo.printing\", \"foo.html\", and \"foo.io\". These names can be anything you want. They're used to indicate the area of an application or library in which a logged-message originates. Later you will see how you can use this concept to +message originates. Later you will see how you can use this concept to fine-tune logging behaviors based on specific application areas. You can also tune logging behaviors based upon how important a message is.@@ -50,7 +31,7 @@ some convenient functions that correspond to these importance levels: 'debugM' through 'emergencyM' log messages with the specified importance. -Now, an importance level (or 'Priority') +Now, an importance level (or 'Priority') is associated not just with a particular message but also with a 'Logger'. If the 'Priority' of a given log message is lower than the 'Priority' configured in the 'Logger', that message is ignored. This@@ -96,45 +77,73 @@ there will be called for every message. You can use 'getRootLogger' to get it or 'rootLoggerName' to work with it by name. +The formatting of log messages may be customized by setting a 'LogFormatter'+on the desired 'LogHandler'. There are a number of simple formatters defined+in "System.Log.Formatter", which may be used directly, or extend to create+your own formatter.+ Here's an example to illustrate some of these concepts: > import System.Log.Logger > import System.Log.Handler.Syslog-> +> import System.Log.Handler.Simple+> import System.Log.Handler (setFormatter)+> import System.Log.Formatter+> > -- By default, all messages of level WARNING and above are sent to stderr. > -- Everything else is ignored.-> +> > -- "MyApp.Component" is an arbitrary string; you can tune > -- logging behavior based on it later. > main = do-> debugM "MyApp.Component" "This is a debug message -- never to be seen"-> warningM "MyApp.Component2" "Something Bad is about to happen."-> +> logger1 <- getLogger "MyApp.Component"+> logger2 <- getLogger "MyApp.Component2"+> loggerB <- getLogger "MyApp.BuggyComponent"+> loggerW <- getLogger "MyApp.WorkingComponent"+>+> logL logger1 DEBUG "This is a debug message -- never to be seen"+> logL logger2 WARNING "Something Bad is about to happen."+> > -- Copy everything to syslog from here on out. > s <- openlog "SyslogStuff" [PID] USER DEBUG-> updateGlobalLogger rootLoggerName (addHandler s)-> -> errorM "MyApp.Component" "This is going to stderr and syslog."+> saveGlobalLogger =<< addHandler s <$> getRootLogger >+> logL logger1 ERROR "This is going to stderr and syslog."+> > -- Now we'd like to see everything from BuggyComponent > -- at DEBUG or higher go to syslog and stderr. > -- Also, we'd like to still ignore things less than > -- WARNING in other areas.-> -- +> -- > -- So, we adjust the Logger for MyApp.BuggyComponent. >-> updateGlobalLogger "MyApp.BuggyComponent"-> (setLevel DEBUG)+> let loggerB' = setLevel DEBUG loggerB+> saveGlobalLogger loggerB' > > -- This message will go to syslog and stderr-> debugM "MyApp.BuggyComponent" "This buggy component is buggy"-> +> logL loggerB' DEBUG "This buggy component is buggy"+> > -- This message will go to syslog and stderr too.-> warningM "MyApp.BuggyComponent" "Still Buggy"-> +> logL loggerB' WARNING "Still Buggy"+> > -- This message goes nowhere.-> debugM "MyApp.WorkingComponent" "Hello"-+> logL loggerW DEBUG "Hello"+>+> -- Now we decide we'd also like to log everything from BuggyComponent at DEBUG+> -- or higher to a file for later diagnostics. We'd also like to customize the+> -- format of the log message, so we use a 'simpleLogFormatter'+>+> h <- fileHandler "debug.log" DEBUG >>= \lh -> return $+> setFormatter lh (simpleLogFormatter "[$time : $loggername : $prio] $msg")+> let loggerB'' = addHandler h loggerB'+> saveGlobalLogger loggerB''+>+> -- This message will go to syslog and stderr,+> -- and to the file "debug.log" with a format like :+> -- [2010-05-23 16:47:28 : MyApp.BuggyComponent : DEBUG] Some useful diagnostics...+> logL loggerB'' DEBUG "Some useful diagnostics..."+>+> -} module System.Log.Logger(@@ -150,6 +159,7 @@ -- make your job easier. debugM, infoM, noticeM, warningM, errorM, criticalM, alertM, emergencyM,+ removeAllHandlers, traplogging, -- ** Logging to a particular Logger by object logL,@@ -174,7 +184,7 @@ but other functions won't see the changes. To make a change global, you'll need to use 'updateGlobalLogger' or 'saveGlobalLogger'. -}- addHandler, setHandlers,+ addHandler, removeHandler, setHandlers, getLevel, setLevel, clearLevel, -- ** Saving Your Changes {- | These functions commit changes you've made to loggers to the global@@ -183,7 +193,8 @@ updateGlobalLogger ) where import System.Log-import System.Log.Handler(LogHandler)+import System.Log.Handler(LogHandler, close)+import System.Log.Formatter(LogFormatter) -- for Haddock import qualified System.Log.Handler(handle) import System.Log.Handler.Simple import System.IO@@ -193,7 +204,7 @@ import Data.Maybe import qualified Data.Map as Map import qualified Control.Exception-import Control.Monad.Error+ --------------------------------------------------------------------------- -- Basic logger types ---------------------------------------------------------------------------@@ -222,36 +233,36 @@ -- Logger Tree Storage --------------------------------------------------------------------------- --- | The log tree. Initialize it with a default root logger +-- | The log tree. Initialize it with a default root logger -- and (FIXME) a logger for MissingH itself. {-# NOINLINE logTree #-} logTree :: MVar LogTree -- note: only kick up tree if handled locally-logTree = +logTree = unsafePerformIO $ do h <- streamHandler stderr DEBUG- newMVar (Map.singleton rootLoggerName (Logger + newMVar (Map.singleton rootLoggerName (Logger {level = Just WARNING, name = "", handlers = [HandlerT h]})) {- | Given a name, return all components of it, starting from the root.-Example return value: +Example return value: >["", "MissingH", "System.Cmd.Utils", "System.Cmd.Utils.pOpen"] -} componentsOfName :: String -> [String]-componentsOfName name =+componentsOfName name' = let joinComp [] _ = [] joinComp (x:xs) [] = x : joinComp xs x joinComp (x:xs) accum = let newlevel = accum ++ "." ++ x in newlevel : joinComp xs newlevel in- rootLoggerName : joinComp (split "." name) []+ rootLoggerName : joinComp (split "." name') [] --------------------------------------------------------------------------- -- Logging With Location@@ -342,7 +353,7 @@ createLoggers (x:xs) lt = -- Add logger to tree if Map.member x lt then createLoggers xs lt- else createLoggers xs + else createLoggers xs (Map.insert x (defaultLogger {name=x}) lt) defaultLogger = Logger Nothing [] undefined @@ -357,31 +368,31 @@ -- | Handle a log request. handle :: Logger -> LogRecord -> IO ()-handle l (pri, msg) = +handle l (pri, msg) = let parentLoggers :: String -> IO [Logger] parentLoggers [] = return []- parentLoggers name = - let pname = (head . drop 1 . reverse . componentsOfName) name- in + parentLoggers name' =+ let pname = (head . drop 1 . reverse . componentsOfName) name'+ in do parent <- getLogger pname next <- parentLoggers pname return (parent : next) parentHandlers :: String -> IO [HandlerT]- parentHandlers name = parentLoggers name >>= (return . concatMap handlers)+ parentHandlers name' = parentLoggers name' >>= (return . concatMap handlers) -- Get the priority we should use. Find the first logger in the tree, -- starting here, with a set priority. If even root doesn't have one, -- assume DEBUG. getLoggerPriority :: String -> IO Priority- getLoggerPriority name =- do pl <- parentLoggers name+ getLoggerPriority name' =+ do pl <- parentLoggers name' case catMaybes . map level $ (l : pl) of [] -> return DEBUG (x:_) -> return x in do lp <- getLoggerPriority (name l) if pri >= lp- then do + then do ph <- parentHandlers (name l) sequence_ (handlerActions (ph ++ (handlers l)) (pri, msg) (name l))@@ -396,15 +407,35 @@ -- | Generate IO actions for the handlers. handlerActions :: [HandlerT] -> LogRecord -> String -> [IO ()] handlerActions h lr loggername = map (callHandler lr loggername ) h- + -- | Add handler to 'Logger'. Returns a new 'Logger'. addHandler :: LogHandler a => a -> Logger -> Logger addHandler h l= l{handlers = (HandlerT h) : (handlers l)} +-- | Remove a handler from the 'Logger'. Handlers are removed in the reverse+-- order they were added, so the following property holds for any 'LogHandler'+-- @h@:+--+-- > removeHandler . addHandler h = id+--+-- If no handlers are associated with the 'Logger', it is returned unchanged.+--+-- The root logger's default handler that writes every message to stderr can+-- be removed by using this function before any handlers have been added+-- to the root logger:+--+-- > updateGlobalLogger rootLoggerName removeHandler+removeHandler :: Logger -> Logger+removeHandler l =+ case hs of [] -> l+ _ -> l{handlers = tail hs}+ where+ hs = handlers l+ -- | Set the 'Logger'\'s list of handlers to the list supplied. -- All existing handlers are removed first. setHandlers :: LogHandler a => [a] -> Logger -> Logger-setHandlers hl l = +setHandlers hl l = l{handlers = map (\h -> HandlerT h) hl} -- | Returns the "level" of the logger. Items beneath this@@ -429,7 +460,7 @@ -- account any changes you may have made. saveGlobalLogger :: Logger -> IO ()-saveGlobalLogger l = modifyMVar_ logTree +saveGlobalLogger l = modifyMVar_ logTree (\lt -> return $ Map.insert (name l) l lt) {- | Helps you make changes on the given logger. Takes a function@@ -440,35 +471,43 @@ > (setLevel DEBUG . setHandlers [s]) -} -updateGlobalLogger :: String -- ^ Logger name- -> (Logger -> Logger) -- ^ Function to call- -> IO ()+updateGlobalLogger :: String -- ^ Logger name+ -> (Logger -> Logger) -- ^ Function to call+ -> IO () updateGlobalLogger ln func = do l <- getLogger ln saveGlobalLogger (func l) +-- | Allow graceful shutdown. Release all opened files, handlers, etc.+removeAllHandlers :: IO ()+removeAllHandlers =+ modifyMVar_ logTree $ \lt -> do+ let allHandlers = Map.foldr (\l r -> concat [r, handlers l]) [] lt+ mapM_ (\(HandlerT h) -> close h) allHandlers+ return $ Map.map (\l -> l {handlers = []}) lt+ {- | Traps exceptions that may occur, logging them, then passing them on. Takes a logger name, priority, leading description text (you can set it to @\"\"@ if you don't want any), and action to run. -} -traplogging :: String -- Logger name- -> Priority -- Logging priority- -> String -- Descriptive text to prepend to logged messages- -> IO a -- Action to run- -> IO a -- Return value-traplogging logger priority desc action =+traplogging :: String -- ^ Logger name+ -> Priority -- ^ Logging priority+ -> String -- ^ Descriptive text to prepend to logged messages+ -> IO a -- ^ Action to run+ -> IO a -- ^ Return value+traplogging logger priority' desc action = let realdesc = case desc of "" -> "" x -> x ++ ": " handler :: Control.Exception.SomeException -> IO a handler e = do- logM logger priority (realdesc ++ (show e))+ logM logger priority' (realdesc ++ (show e)) Control.Exception.throw e -- Re-raise it in Control.Exception.catch action handler- + {- This function pulled in from MissingH to avoid a dep on it -} split :: Eq a => [a] -> [a] -> [[a]] split _ [] = []@@ -495,4 +534,3 @@ then (x:ys,zs) else ([],list) where (ys,zs) = spanList func xs-
+ src/UTF8.hs view
@@ -0,0 +1,44 @@+-- Internal module to support UTF8+module UTF8 (toUTF8BS) where++import Data.Char (ord)+import Data.Bits+import Data.Word (Word8)+import qualified Data.ByteString as BS++toUTF8BS :: String -> BS.ByteString+toUTF8BS = BS.pack . encodeStringUtf8++-- | Encode 'String' to a list of UTF8-encoded octets+--+-- Code-points in the @U+D800@-@U+DFFF@ range will be encoded+-- as the replacement character (i.e. @U+FFFD@).+--+-- The code is extracted from Cabal library, written originally HVR+encodeStringUtf8 :: String -> [Word8]+encodeStringUtf8 [] = []+encodeStringUtf8 (c:cs)+ | c <= '\x07F' = w8+ : encodeStringUtf8 cs+ | c <= '\x7FF' = (0xC0 .|. w8ShiftR 6 )+ : (0x80 .|. (w8 .&. 0x3F))+ : encodeStringUtf8 cs+ | c <= '\xD7FF'= (0xE0 .|. w8ShiftR 12 )+ : (0x80 .|. (w8ShiftR 6 .&. 0x3F))+ : (0x80 .|. (w8 .&. 0x3F))+ : encodeStringUtf8 cs+ | c <= '\xDFFF'= 0xEF : 0xBF : 0xBD -- U+FFFD+ : encodeStringUtf8 cs+ | c <= '\xFFFF'= (0xE0 .|. w8ShiftR 12 )+ : (0x80 .|. (w8ShiftR 6 .&. 0x3F))+ : (0x80 .|. (w8 .&. 0x3F))+ : encodeStringUtf8 cs+ | otherwise = (0xf0 .|. w8ShiftR 18 )+ : (0x80 .|. (w8ShiftR 12 .&. 0x3F))+ : (0x80 .|. (w8ShiftR 6 .&. 0x3F))+ : (0x80 .|. (w8 .&. 0x3F))+ : encodeStringUtf8 cs+ where+ w8 = fromIntegral (ord c) :: Word8+ w8ShiftR :: Int -> Word8+ w8ShiftR = fromIntegral . shiftR (ord c)
testsrc/Tests.hs view
@@ -1,26 +1,22 @@ {- arch-tag: Tests main file Copyright (C) 2004 John Goerzen <jgoerzen@complete.org>--This program is free software; you can redistribute it and/or modify-it under the terms of the GNU General Public License as published by-the Free Software Foundation; either version 2 of the License, or-(at your option) any later version.--This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU General Public License for more details.--You should have received a copy of the GNU General Public License-along with this program; if not, write to the Free Software-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA+License: BSD3 -}- module Tests(tests) where+ import Test.HUnit -test1 = TestCase ("x" @=? "x")+import System.Log -tests = TestList [TestLabel "test1" test1]+tests = TestList [TestLabel "priority levels" priorityLevels] +priorityLevels :: Test+priorityLevels = TestList [+ TestCase ( DEBUG <= DEBUG @=? True),+ TestCase ( DEBUG <= INFO @=? True),+ TestCase ( INFO <= WARNING @=? True),+ TestCase ( WARNING <= ERROR @=? True),+ TestCase ( INFO <= ERROR @=? True),+ TestCase ( ERROR > INFO @=? True)+ ]
testsrc/runtests.hs view
@@ -1,19 +1,6 @@ {- arch-tag: Test runner-Copyright (C) 2004 John Goerzen <jgoerzen@complete.org>--This program is free software; you can redistribute it and/or modify-it under the terms of the GNU General Public License as published by-the Free Software Foundation; either version 2 of the License, or-(at your option) any later version.--This program is distributed in the hope that it will be useful,-but WITHOUT ANY WARRANTY; without even the implied warranty of-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the-GNU General Public License for more details.--You should have received a copy of the GNU General Public License-along with this program; if not, write to the Free Software-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA+Copyright (C) 2004-2011 John Goerzen <jgoerzen@complete.org>+License: BSD3 -} module Main where
− winbuild.bat
@@ -1,4 +0,0 @@-ghc -package Cabal Setup.hs -o setup.exe -setup configure -setup build -