europeana-logging 0.2.5 → 0.2.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: 398c9a157b8fd05812bf5a864c9ccbb15f5d4c7c
4
- data.tar.gz: 5a1ddbbf232ffa4f94747e3213b56089000a7437
2
+ SHA256:
3
+ metadata.gz: 32a12b0af7878b78f20a7b0c8914e46426896717dea5207dbf6301331d92a03f
4
+ data.tar.gz: d8482cc23189b8d28b0d8b4ef4986c942540b2ccc74479673bac0a17b1dfbd09
5
5
  SHA512:
6
- metadata.gz: 8630d0a53adbd7032eb3780bedf0d9046cf85c922d2a8e64dea4550d05dec8220620ddf3f93c5142aa34e0b2674d0b4872deb42d408adb0fddb1f057d0f256eb
7
- data.tar.gz: 8ea43a0ab07f40e6512ed29663d1e3406fd8dadbe04f0a949df370f06a5d6f614a49656e4dab8c9b3b770d73f1ab2ab0a8d9d43a427821ac5b6f51cecfa1f791
6
+ metadata.gz: 189a4d49d485c9ab4cc761c6f6ec8005c34e649deb3e65a0820b02fa0351e031759302911a4593656d8aad286097c8247b67672e92cbe277d3505f2c66a1bfb9
7
+ data.tar.gz: b0a3ebc56757a17bbb928641035ba94b2309eebaf7abb8595fcfac68ce216b85e54bed4c1a48e48eaf04f5f583e26b2331eb9b74683f6a5497ee4913227c05f9
data/LICENSE.md CHANGED
@@ -1,119 +1,188 @@
1
- # European Union Public Licence v. 1.1
2
- EUPL © the European Community 2007
1
+ # European Union Public Licence v. 1.2
2
+ EUPL © the European Union 2007, 2016
3
3
 
4
- This European Union Public Licence (the EUPL) applies to the Work or Software (as defined below) which is provided under the terms of this Licence. Any use of the Work, other than as authorised under this Licence is prohibited (to the extent such use is covered by a right of the copyright holder of the Work).
5
- The Original Work is provided under the terms of this Licence when the Licensor (as defined below) has placed the following notice immediately following the copyright notice for the Original Work:
6
-
7
- Licensed under the EUPL v.1.1
8
-
9
- or has expressed by any other mean his willingness to license under the EUPL.
4
+ This European Union Public Licence (the *EUPL*) applies to the Work (as defined below) which is provided under the
5
+ terms of this Licence. Any use of the Work, other than as authorised under this Licence is prohibited (to the extent such
6
+ use is covered by a right of the copyright holder of the Work).
7
+ The Work is provided under the terms of this Licence when the Licensor (as defined below) has placed the following
8
+ notice immediately following the copyright notice for the Work:
9
+ Licensed under the EUPL
10
+ or has expressed by any other means his willingness to license under the EUPL.
10
11
 
11
12
  ## 1. Definitions
12
13
  In this Licence, the following terms have the following meaning:
13
- - *The Licence*: this Licence.
14
- - *The Original Work or the Software*: the software distributed and/or communicated by the Licensor under this Licence, available as Source Code and also as Executable Code as the case may be.
15
- - *Derivative Works*: the works or software that could be created by the Licensee, based upon the Original Work or modifications thereof. This Licence does not define the extent of modification or dependence on the Original Work required in order to classify a work as a Derivative Work; this extent is determined by copyright law applicable in the country mentioned in Article 15.
16
- - *The Work*: the Original Work and/or its Derivative Works.
17
- - *The Source Code*: the human-readable form of the Work which is the most convenient for people to study and modify.
18
- - *The Executable Code*: any code which has generally been compiled and which is meant to be interpreted by a computer as a program.
19
- - *The Licensor*: the natural or legal person that distributes and/or communicates the Work under the Licence.
20
- - *Contributor(s)*: any natural or legal person who modifies the Work under the Licence, or otherwise contributes to the creation of a Derivative Work.
21
- - *The Licensee* or “*You*”: any natural or legal person who makes any usage of the Software under the terms of the Licence.
22
- - *Distribution and/or Communication*: any act of selling, giving, lending, renting, distributing, communicating, transmitting, or otherwise making available, on-line or off-line, copies of the Work or providing access to its essential functionalities at the disposal of any other natural or legal person.
14
+ * *The Licence*:this Licence.
15
+ * *The Original Work*:the work or software distributed or communicated by the Licensor under this Licence, available
16
+ as Source Code and also as Executable Code as the case may be.
17
+ * *Derivative Works*:the works or software that could be created by the Licensee, based upon the Original Work or
18
+ modifications thereof. This Licence does not define the extent of modification or dependence on the Original Work
19
+ required in order to classify a work as a Derivative Work; this extent is determined by copyright law applicable in
20
+ the country mentioned in Article 15.
21
+ * *The Work*:the Original Work or its Derivative Works.
22
+ * *The Source Code*:the human-readable form of the Work which is the most convenient for people to study and
23
+ modify.
24
+ * *The Executable Code*:any code which has generally been compiled and which is meant to be interpreted by
25
+ a computer as a program.
26
+ * *The Licensor*:the natural or legal person that distributes or communicates the Work under the Licence.
27
+ * *Contributor(s)*:any natural or legal person who modifies the Work under the Licence, or otherwise contributes to
28
+ the creation of a Derivative Work.
29
+ * *The Licensee* or *You*:any natural or legal person who makes any usage of the Work under the terms of the
30
+ Licence.
31
+ * *Distribution* or *Communication*:any act of selling, giving, lending, renting, distributing, communicating,
32
+ transmitting, or otherwise making available, online or offline, copies of the Work or providing access to its essential
33
+ functionalities at the disposal of any other natural or legal person.
23
34
 
24
35
  ## 2. Scope of the rights granted by the Licence
25
- The Licensor hereby grants You a world-wide, royalty-free, non-exclusive, sub- licensable licence to do the following, for the duration of copyright vested in the Original Work:
26
- - use the Work in any circumstance and for all usage,
27
- - reproduce the Work,
28
- - modify the Original Work, and make Derivative Works based upon the Work,
29
- - communicate to the public, including the right to make available or display the Work or copies thereof to the public and perform publicly, as the case may be, the Work,
30
- - distribute the Work or copies thereof,
31
- - lend and rent the Work or copies thereof,
32
- - sub-license rights in the Work or copies thereof.
33
-
34
- Those rights can be exercised on any media, supports and formats, whether now known or later invented, as far as the applicable law permits so.
35
-
36
- In the countries where moral rights apply, the Licensor waives his right to exercise his moral right to the extent allowed by law in order to make effective the licence of the economic rights here above listed.
37
-
38
- The Licensor grants to the Licensee royalty-free, non exclusive usage rights to any patents held by the Licensor, to the extent necessary to make use of the rights granted on the Work under this Licence.
36
+ The Licensor hereby grants You a worldwide, royalty-free, non-exclusive, sublicensable licence to do the following, for
37
+ the duration of copyright vested in the Original Work:
38
+ * use the Work in any circumstance and for all usage,
39
+ * reproduce the Work,
40
+ * modify the Work, and make Derivative Works based upon the Work,
41
+ * communicate to the public, including the right to make available or display the Work or copies thereof to the public
42
+ and perform publicly, as the case may be, the Work,
43
+ * distribute the Work or copies thereof,
44
+ * lend and rent the Work or copies thereof,
45
+ * sublicense rights in the Work or copies thereof.
46
+ Those rights can be exercised on any media, supports and formats, whether now known or later invented, as far as the
47
+ applicable law permits so.
48
+ In the countries where moral rights apply, the Licensor waives his right to exercise his moral right to the extent allowed
49
+ by law in order to make effective the licence of the economic rights here above listed.
50
+ The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to any patents held by the Licensor, to the
51
+ extent necessary to make use of the rights granted on the Work under this Licence.
39
52
 
40
53
  ## 3. Communication of the Source Code
41
- The Licensor may provide the Work either in its Source Code form, or as Executable Code. If the Work is provided as Executable Code, the Licensor provides in addition a machine-readable copy of the Source Code of the Work along with each copy of the Work that the Licensor distributes or indicates, in a notice following the copyright notice attached to the Work, a repository where the Source Code is easily and freely accessible for as long as the Licensor continues to distribute and/or communicate the Work.
54
+ The Licensor may provide the Work either in its Source Code form, or as Executable Code. If the Work is provided as
55
+ Executable Code, the Licensor provides in addition a machine-readable copy of the Source Code of the Work along with
56
+ each copy of the Work that the Licensor distributes or indicates, in a notice following the copyright notice attached to
57
+ the Work, a repository where the Source Code is easily and freely accessible for as long as the Licensor continues to
58
+ distribute or communicate the Work.
42
59
 
43
60
  ## 4. Limitations on copyright
44
- Nothing in this Licence is intended to deprive the Licensee of the benefits from any exception or limitation to the exclusive rights of the rights owners in the Original Work or Software, of the exhaustion of those rights or of other applicable limitations thereto.
61
+ Nothing in this Licence is intended to deprive the Licensee of the benefits from any exception or limitation to the
62
+ exclusive rights of the rights owners in the Work, of the exhaustion of those rights or of other applicable limitations
63
+ thereto.
45
64
 
46
65
  ## 5. Obligations of the Licensee
47
- The grant of the rights mentioned above is subject to some restrictions and obligations imposed on the Licensee. Those obligations are the following:
48
-
49
- **Attribution right**: the Licensee shall keep intact all copyright, patent or trademarks notices and all notices that refer to the Licence and to the disclaimer of warranties. The Licensee must include a copy of such notices and a copy of the Licence with every copy of the Work he/she distributes and/or communicates. The Licensee must cause any Derivative Work to carry prominent notices stating that the Work has been modified and the date of modification.
66
+ The grant of the rights mentioned above is subject to some restrictions and obligations imposed on the Licensee. Those
67
+ obligations are the following:
68
+
69
+ **Attribution right**: The Licensee shall keep intact all copyright, patent or trademarks notices and all notices that refer to
70
+ the Licence and to the disclaimer of warranties. The Licensee must include a copy of such notices and a copy of the
71
+ Licence with every copy of the Work he/she distributes or communicates. The Licensee must cause any Derivative Work
72
+ to carry prominent notices stating that the Work has been modified and the date of modification.
73
+
74
+ **Copyleft clause**: If the Licensee distributes or communicates copies of the Original Works or Derivative Works, this
75
+ Distribution or Communication will be done under the terms of this Licence or of a later version of this Licence unless
76
+ the Original Work is expressly distributed only under this version of the Licence — for example by communicating
77
+ *EUPL v. 1.2 only*. The Licensee (becoming Licensor) cannot offer or impose any additional terms or conditions on the
78
+ Work or Derivative Work that alter or restrict the terms of the Licence.
79
+
80
+ **Compatibility clause**: If the Licensee Distributes or Communicates Derivative Works or copies thereof based upon both
81
+ the Work and another work licensed under a Compatible Licence, this Distribution or Communication can be done
82
+ under the terms of this Compatible Licence. For the sake of this clause, *Compatible Licence* refers to the licences listed
83
+ in the appendix attached to this Licence. Should the Licensee's obligations under the Compatible Licence conflict with
84
+ his/her obligations under this Licence, the obligations of the Compatible Licence shall prevail.
85
+
86
+ **Provision of Source Code**: When distributing or communicating copies of the Work, the Licensee will provide
87
+ a machine-readable copy of the Source Code or indicate a repository where this Source will be easily and freely available
88
+ for as long as the Licensee continues to distribute or communicate the Work.
89
+ Legal Protection: This Licence does not grant permission to use the trade names, trademarks, service marks, or names
90
+ of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and
91
+ reproducing the content of the copyright notice.
50
92
 
51
- **Copyleft clause**: If the Licensee distributes and/or communicates copies of the Original Works or Derivative Works based upon the Original Work, this Distribution and/or Communication will be done under the terms of this Licence or of a later version of this Licence unless the Original Work is expressly distributed only under this version of the Licence. The Licensee (becoming Licensor) cannot offer or impose any additional terms or conditions on the Work or Derivative Work that alter or restrict the terms of the Licence.
52
-
53
- **Compatibility clause**: If the Licensee Distributes and/or Communicates Derivative Works or copies thereof based upon both the Original Work and another work licensed under a Compatible Licence, this Distribution and/or Communication can be done under the terms of this Compatible Licence. For the sake of this clause, “Compatible Licence” refers to the licences listed in the appendix attached to this Licence. Should the Licensee’s obligations under the Compatible Licence conflict with his/her obligations under this Licence, the obligations of the Compatible Licence shall prevail.
54
-
55
- **Provision of Source Code**: When distributing and/or communicating copies of the Work, the Licensee will provide a machine-readable copy of the Source Code or indicate a repository where this Source will be easily and freely available for as long as the Licensee continues to distribute and/or communicate the Work.
56
-
57
- **Legal Protection**: This Licence does not grant permission to use the trade names, trademarks, service marks, or names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the copyright notice.
58
-
59
93
  ## 6. Chain of Authorship
60
- The original Licensor warrants that the copyright in the Original Work granted hereunder is owned by him/her or licensed to him/her and that he/she has the power and authority to grant the Licence.
61
-
62
- Each Contributor warrants that the copyright in the modifications he/she brings to the Work are owned by him/her or licensed to him/her and that he/she has the power and authority to grant the Licence.
63
-
64
- Each time You accept the Licence, the original Licensor and subsequent Contributors grant You a licence to their contributions to the Work, under the terms of this Licence.
94
+ The original Licensor warrants that the copyright in the Original Work granted hereunder is owned by him/her or
95
+ licensed to him/her and that he/she has the power and authority to grant the Licence.
96
+ Each Contributor warrants that the copyright in the modifications he/she brings to the Work are owned by him/her or
97
+ licensed to him/her and that he/she has the power and authority to grant the Licence.
98
+ Each time You accept the Licence, the original Licensor and subsequent Contributors grant You a licence to their contributions
99
+ to the Work, under the terms of this Licence.
65
100
 
66
101
  ## 7. Disclaimer of Warranty
67
- The Work is a work in progress, which is continuously improved by numerous contributors. It is not a finished work and may therefore contain defects or “bugs” inherent to this type of software development.
68
-
69
- For the above reason, the Work is provided under the Licence on an as is basis and without warranties of any kind concerning the Work, including without limitation merchantability, fitness for a particular purpose, absence of defects or errors, accuracy, non-infringement of intellectual property rights other than copyright as stated in Article 6 of this Licence.
70
-
102
+ The Work is a work in progress, which is continuously improved by numerous Contributors. It is not a finished work
103
+ and may therefore contain defects or *bugs* inherent to this type of development.
104
+ For the above reason, the Work is provided under the Licence on an *as is* basis and without warranties of any kind
105
+ concerning the Work, including without limitation merchantability, fitness for a particular purpose, absence of defects or
106
+ errors, accuracy, non-infringement of intellectual property rights other than copyright as stated in Article 6 of this
107
+ Licence.
71
108
  This disclaimer of warranty is an essential part of the Licence and a condition for the grant of any rights to the Work.
72
109
 
73
110
  ## 8. Disclaimer of Liability
74
- Except in the cases of wilful misconduct or damages directly caused to natural persons, the Licensor will in no event be liable for any direct or indirect, material or moral, damages of any kind, arising out of the Licence or of the use of the Work, including without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, loss of data or any commercial damage, even if the Licensor has been advised of the possibility of such damage. However, the Licensor will be liable under statutory product liability laws as far such laws apply to the Work.
111
+ Except in the cases of wilful misconduct or damages directly caused to natural persons, the Licensor will in no event be
112
+ liable for any direct or indirect, material or moral, damages of any kind, arising out of the Licence or of the use of the
113
+ Work, including without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, loss
114
+ of data or any commercial damage, even if the Licensor has been advised of the possibility of such damage. However,
115
+ the Licensor will be liable under statutory product liability laws as far such laws apply to the Work.
75
116
 
76
117
  ## 9. Additional agreements
77
- While distributing the Original Work or Derivative Works, You may choose to conclude an additional agreement to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or services consistent with this Licence. However, in accepting such obligations, You may act only on your own behalf and on your sole responsibility, not on behalf of the original Licensor or any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against such Contributor by the fact You have accepted any such warranty or additional liability.
78
- 
79
- ## 10. Acceptance of the Licence
80
- The provisions of this Licence can be accepted by clicking on an icon “I agree” placed under the bottom of a window displaying the text of this Licence or by affirming consent in any other similar way, in accordance with the rules of applicable law. Clicking on that icon indicates your clear and irrevocable acceptance of this Licence and all of its terms and conditions.
118
+ While distributing the Work, You may choose to conclude an additional agreement, defining obligations or services
119
+ consistent with this Licence. However, if accepting obligations, You may act only on your own behalf and on your sole
120
+ responsibility, not on behalf of the original Licensor or any other Contributor, and only if You agree to indemnify,
121
+ defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against such Contributor by
122
+ the fact You have accepted any warranty or additional liability.
81
123
 
82
- Similarly, you irrevocably accept this Licence and all of its terms and conditions by exercising any rights granted to You by Article 2 of this Licence, such as the use of the Work, the creation by You of a Derivative Work or the Distribution and/or Communication by You of the Work or copies thereof.
124
+ ## 10. Acceptance of the Licence
125
+ The provisions of this Licence can be accepted by clicking on an icon *I agree* placed under the bottom of a window
126
+ displaying the text of this Licence or by affirming consent in any other similar way, in accordance with the rules of
127
+ applicable law. Clicking on that icon indicates your clear and irrevocable acceptance of this Licence and all of its terms
128
+ and conditions.
129
+ Similarly, you irrevocably accept this Licence and all of its terms and conditions by exercising any rights granted to You
130
+ by Article 2 of this Licence, such as the use of the Work, the creation by You of a Derivative Work or the Distribution
131
+ or Communication by You of the Work or copies thereof.
83
132
 
84
133
  ## 11. Information to the public
85
- In case of any Distribution and/or Communication of the Work by means of electronic communication by You (for example, by offering to download the Work from a remote location) the distribution channel or media (for example, a website) must at least provide to the public the information requested by the applicable law regarding the Licensor, the Licence and the way it may be accessible, concluded, stored and reproduced by the Licensee.
134
+ In case of any Distribution or Communication of the Work by means of electronic communication by You (for example,
135
+ by offering to download the Work from a remote location) the distribution channel or media (for example, a website)
136
+ must at least provide to the public the information requested by the applicable law regarding the Licensor, the Licence
137
+ and the way it may be accessible, concluded, stored and reproduced by the Licensee.
86
138
 
87
139
  ## 12. Termination of the Licence
88
- The Licence and the rights granted hereunder will terminate automatically upon any breach by the Licensee of the terms of the Licence.
89
-
90
- Such a termination will not terminate the licences of any person who has received the Work from the Licensee under the Licence, provided such persons remain in full compliance with the Licence.
140
+ The Licence and the rights granted hereunder will terminate automatically upon any breach by the Licensee of the terms
141
+ of the Licence.
142
+ Such a termination will not terminate the licences of any person who has received the Work from the Licensee under
143
+ the Licence, provided such persons remain in full compliance with the Licence.
91
144
 
92
145
  ## 13. Miscellaneous
93
- Without prejudice of Article 9 above, the Licence represents the complete agreement between the Parties as to the Work licensed hereunder.
94
-
95
- If any provision of the Licence is invalid or unenforceable under applicable law, this will not affect the validity or enforceability of the Licence as a whole. Such provision will be construed and/or reformed so as necessary to make it valid and enforceable.
146
+ Without prejudice of Article 9 above, the Licence represents the complete agreement between the Parties as to the
147
+ Work.
148
+ If any provision of the Licence is invalid or unenforceable under applicable law, this will not affect the validity or
149
+ enforceability of the Licence as a whole. Such provision will be construed or reformed so as necessary to make it valid
150
+ and enforceable.
151
+ The European Commission may publish other linguistic versions or new versions of this Licence or updated versions of
152
+ the Appendix, so far this is required and reasonable, without reducing the scope of the rights granted by the Licence.
153
+ New versions of the Licence will be published with a unique version number.
154
+ All linguistic versions of this Licence, approved by the European Commission, have identical value. Parties can take
155
+ advantage of the linguistic version of their choice.
96
156
 
97
- The European Commission may publish other linguistic versions and/or new versions of this Licence, so far this is required and reasonable, without reducing the scope of the rights granted by the Licence. New versions of the Licence will be published with a unique version number.
98
-
99
- All linguistic versions of this Licence, approved by the European Commission, have identical value. Parties can take advantage of the linguistic version of their choice.
100
- 
101
157
  ## 14. Jurisdiction
102
- Any litigation resulting from the interpretation of this License, arising between the European Commission, as a Licensor, and any Licensee, will be subject to the jurisdiction of the Court of Justice of the European Communities, as laid down in article 238 of the Treaty establishing the European Community.
103
-
104
- Any litigation arising between Parties, other than the European Commission, and resulting from the interpretation of this License, will be subject to the exclusive jurisdiction of the competent court where the Licensor resides or conducts its primary business.
158
+ Without prejudice to specific agreement between parties,
159
+ * any litigation resulting from the interpretation of this License, arising between the European Union institutions,
160
+ bodies, offices or agencies, as a Licensor, and any Licensee, will be subject to the jurisdiction of the Court of Justice
161
+ of the European Union, as laid down in article 272 of the Treaty on the Functioning of the European Union,
162
+ * any litigation arising between other parties and resulting from the interpretation of this License, will be subject to
163
+ the exclusive jurisdiction of the competent court where the Licensor resides or conducts its primary business.
105
164
 
106
165
  ## 15. Applicable Law
107
- This Licence shall be governed by the law of the European Union country where the Licensor resides or has his registered office.
108
-
109
- This licence shall be governed by the Belgian law if:
110
-
111
- - a litigation arises between the European Commission, as a Licensor, and any Licensee;
112
- - the Licensor, other than the European Commission, has no residence or registered office inside a European Union country.
166
+ Without prejudice to specific agreement between parties,
167
+ * this Licence shall be governed by the law of the European Union Member State where the Licensor has his seat,
168
+ resides or has his registered office,
169
+ * this licence shall be governed by Belgian law if the Licensor has no seat, residence or registered office inside
170
+ a European Union Member State.
113
171
 
114
172
  ## Appendix
115
- “Compatible Licences” according to article 5 EUPL are:
116
- - *GNU General Public License (GNU GPL) v. 2 - Open Software License (OSL) v. 2.1, v. 3.0*
117
- - *Common Public License v. 1.0*
118
- - *Eclipse Public License v. 1.0*
119
- - *Cecill v. 2.0*
173
+
174
+ *Compatible Licences* according to Article 5 EUPL are:
175
+ * GNU General Public License (GPL) v. 2, v. 3
176
+ * GNU Affero General Public License (AGPL) v. 3
177
+ * Open Software License (OSL) v. 2.1, v. 3.0
178
+ * Eclipse Public License (EPL) v. 1.0
179
+ * CeCILL v. 2.0, v. 2.1
180
+ * Mozilla Public Licence (MPL) v. 2
181
+ * GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3
182
+ * Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for works other than software
183
+ * European Union Public Licence (EUPL) v. 1.1, v. 1.2
184
+ * Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong Reciprocity (LiLiQ-R+).
185
+ The European Commission may update this Appendix to later versions of the above licences without producing
186
+ a new version of the EUPL, as long as they provide the rights granted in Article 2 of this Licence and protect the
187
+ covered Source Code from exclusive appropriation.
188
+ All other changes or additions to this Appendix require the production of a new EUPL version.
data/README.md CHANGED
@@ -19,6 +19,6 @@ bundle
19
19
 
20
20
  ## License
21
21
 
22
- Licensed under the EUPL V.1.1.
22
+ Licensed under the EUPL v1.2.
23
23
 
24
24
  For full details, see [LICENSE.md](LICENSE.md).
@@ -17,6 +17,10 @@ module Europeana
17
17
  def append_info_to_payload(payload)
18
18
  super
19
19
  payload[:session_id] = session_id_from_session unless session_id_from_session.blank?
20
+
21
+ # Cloudflare client IP and country data
22
+ payload[:cf_connecting_ip] = request.headers['CF-Connecting-IP']
23
+ payload[:cf_ipcountry] = request.headers['CF-IPCountry']
20
24
  end
21
25
 
22
26
  def session_id_from_session
@@ -12,13 +12,17 @@ module Europeana
12
12
 
13
13
  # Configure lograge
14
14
  initializer 'europeana_logging.configure_lograge' do |app|
15
- app.config.lograge.custom_options = lambda do |event|
16
- {}.tap do |custom|
17
- if event.payload.key?(:redis_runtime)
18
- custom[:redis] = event.payload[:redis_runtime].to_f.round(2)
19
- end
20
- if event.payload.key?(:session_id)
21
- custom[:session_id] = event.payload[:session_id]
15
+ if app.config.lograge.custom_options.nil?
16
+ app.config.lograge.custom_options = lambda do |event|
17
+ {}.tap do |custom|
18
+ if event.payload.key?(:redis_runtime)
19
+ custom[:redis] = event.payload[:redis_runtime].to_f.round(2)
20
+ end
21
+ %i(session_id cf_connecting_ip cf_ipcountry).each do |key|
22
+ if event.payload.key?(key)
23
+ custom[key] = event.payload[key]
24
+ end
25
+ end
22
26
  end
23
27
  end
24
28
  end
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
  module Europeana
3
3
  module Logging
4
- VERSION = '0.2.5'
4
+ VERSION = '0.2.6'
5
5
  end
6
6
  end
@@ -0,0 +1,6 @@
1
+ ----------------------------------
2
+ Europeana::LoggingTest: test_truth
3
+ ----------------------------------
4
+ ----------------------------------
5
+ Europeana::LoggingTest: test_truth
6
+ ----------------------------------
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: europeana-logging
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.5
4
+ version: 0.2.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Richard Doe
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-06-14 00:00:00.000000000 Z
11
+ date: 2019-08-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -126,7 +126,7 @@ files:
126
126
  - test/test_helper.rb
127
127
  homepage: https://github.com/europeana/europeana-logging-ruby
128
128
  licenses:
129
- - EUPL-1.1
129
+ - EUPL-1.2
130
130
  metadata: {}
131
131
  post_install_message:
132
132
  rdoc_options: []
@@ -143,46 +143,45 @@ required_rubygems_version: !ruby/object:Gem::Requirement
143
143
  - !ruby/object:Gem::Version
144
144
  version: '0'
145
145
  requirements: []
146
- rubyforge_project:
147
- rubygems_version: 2.6.12
146
+ rubygems_version: 3.0.1
148
147
  signing_key:
149
148
  specification_version: 4
150
149
  summary: Europeana logging
151
150
  test_files:
152
- - test/integration/navigation_test.rb
151
+ - test/dummy/Rakefile
152
+ - test/dummy/README.rdoc
153
+ - test/dummy/public/422.html
153
154
  - test/dummy/public/404.html
154
155
  - test/dummy/public/500.html
155
156
  - test/dummy/public/favicon.ico
156
- - test/dummy/public/422.html
157
- - test/dummy/config/locales/en.yml
158
- - test/dummy/config/application.rb
159
- - test/dummy/config/routes.rb
160
- - test/dummy/config/environments/development.rb
161
- - test/dummy/config/environments/production.rb
157
+ - test/dummy/config.ru
158
+ - test/dummy/app/assets/javascripts/application.js
159
+ - test/dummy/app/assets/stylesheets/application.css
160
+ - test/dummy/app/controllers/application_controller.rb
161
+ - test/dummy/app/helpers/application_helper.rb
162
+ - test/dummy/app/views/layouts/application.html.erb
163
+ - test/dummy/log/test.log
162
164
  - test/dummy/config/environments/test.rb
163
- - test/dummy/config/secrets.yml
164
- - test/dummy/config/boot.rb
165
- - test/dummy/config/environment.rb
166
- - test/dummy/config/initializers/mime_types.rb
167
- - test/dummy/config/initializers/wrap_parameters.rb
168
- - test/dummy/config/initializers/backtrace_silencers.rb
169
- - test/dummy/config/initializers/filter_parameter_logging.rb
165
+ - test/dummy/config/environments/production.rb
166
+ - test/dummy/config/environments/development.rb
167
+ - test/dummy/config/initializers/inflections.rb
170
168
  - test/dummy/config/initializers/session_store.rb
169
+ - test/dummy/config/initializers/mime_types.rb
171
170
  - test/dummy/config/initializers/assets.rb
172
171
  - test/dummy/config/initializers/cookies_serializer.rb
173
- - test/dummy/config/initializers/inflections.rb
174
- - test/dummy/app/controllers/application_controller.rb
175
- - test/dummy/app/assets/stylesheets/application.css
176
- - test/dummy/app/assets/javascripts/application.js
177
- - test/dummy/app/helpers/application_helper.rb
178
- - test/dummy/app/views/layouts/application.html.erb
179
- - test/dummy/config.ru
180
- - test/dummy/Rakefile
181
- - test/dummy/bin/rake
172
+ - test/dummy/config/initializers/filter_parameter_logging.rb
173
+ - test/dummy/config/initializers/backtrace_silencers.rb
174
+ - test/dummy/config/initializers/wrap_parameters.rb
175
+ - test/dummy/config/locales/en.yml
176
+ - test/dummy/config/environment.rb
177
+ - test/dummy/config/boot.rb
178
+ - test/dummy/config/routes.rb
179
+ - test/dummy/config/secrets.yml
180
+ - test/dummy/config/application.rb
182
181
  - test/dummy/bin/bundle
183
- - test/dummy/bin/setup
182
+ - test/dummy/bin/rake
184
183
  - test/dummy/bin/rails
185
- - test/dummy/README.rdoc
186
- - test/dummy/log/test.log
187
- - test/europeana/logging_test.rb
184
+ - test/dummy/bin/setup
188
185
  - test/test_helper.rb
186
+ - test/integration/navigation_test.rb
187
+ - test/europeana/logging_test.rb